-/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
- See the file COPYING for licensing information. */
+/* Copyright 2010-2011 NORDUnet A/S. All rights reserved.
+ See LICENSE for licensing information. */
#if defined HAVE_CONFIG_H
#include <config.h>
#include <radsec/radsec-impl.h>
#include <radsec/request.h>
#include <radsec/request-impl.h>
-#include <freeradius/libradius.h>
+#include <radius/client.h>
#include "debug.h"
#include "conn.h"
#include "tcp.h"
+#include "udp.h"
/* RFC 5080 2.2.1. Retransmission Behavior. */
#define IRT 2
}
void
-rs_request_add_reqpkt (struct rs_request *req, struct rs_packet *reqpkt)
+rs_request_add_reqpkt (struct rs_request *req, struct rs_packet *req_msg)
{
assert (req);
- req->req_msg = reqpkt;
+ req->req_msg = req_msg;
}
int
const char *user_name,
const char *user_pw)
{
- struct rs_request *req;
+ struct rs_request *req = NULL;
assert (req_out);
+
if (rs_request_create (conn, &req))
return -1;
if (rs_packet_create_authn_request (conn, &req->req_msg, user_name, user_pw))
return -1;
- *req_out = req;
+ if (req_out)
+ *req_out = req;
return RSE_OK;
}
rs_request_destroy (struct rs_request *request)
{
assert (request);
- rs_packet_destroy (request->req_msg);
- rs_packet_destroy (request->resp_msg);
+ assert (request->conn);
+ assert (request->conn->ctx);
+
+ if (request->req_msg)
+ rs_packet_destroy (request->req_msg);
rs_free (request->conn->ctx, request);
}
static void
_rand_rt (struct timeval *res, uint32_t rtprev, uint32_t factor)
{
- uint32_t ms = rtprev * (fr_rand () % factor);
+ uint32_t ms = rtprev * (nr_rand () % factor);
res->tv_sec = rtprev + ms / 1000;
res->tv_usec = (ms % 1000) * 1000;
}
struct timeval end = {0,0};
struct timeval now = {0,0};
struct timeval tmp_tv = {0,0};
- struct timeval mrt_tv = {MRT,0};
+ const struct timeval mrt_tv = {MRT,0};
if (!request || !request->conn || !request->req_msg || !resp_msg)
return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL);
while (1)
{
rs_conn_set_timeout (conn, &rt);
+
r = rs_packet_send (request->req_msg, NULL);
if (r == RSE_OK)
{
resp_msg);
if (r == RSE_OK)
break; /* Success. */
-
- /* Timing out on receiving data or reconnecting a broken TCP
- connection is ok. */
- if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO)
- break; /* Error. */
}
- else if (r != RSE_TIMEOUT_CONN) /* Timeout on TCP connect is ok. */
- break; /* Error. */
+ if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO)
+ break; /* Error. */
+
+ /* Timing out reading or writing. Pop the timeout error from the
+ stack and continue the loop. */
+ rs_err_conn_pop (request->conn);
gettimeofday (&now, NULL);
if (++count > MRC || timercmp (&now, &end, >))
{
- r = RSE_TIMEOUT;
+ r = rs_err_conn_push_fl (request->conn, RSE_TIMEOUT,
+ __FILE__, __LINE__, NULL);
break; /* Timeout. */
}
- /* rt = 2 * rt + _rand_rt (rt, RAND); */
- timeradd (&rt, &rt, &rt); /* rt = 2 * rt */
+ /* rt = 2 * rt + rand_rt (rt, RAND); */
+ timeradd (&rt, &rt, &rt);
_rand_rt (&tmp_tv, IRT, RAND);
timeradd (&rt, &tmp_tv, &rt);
if (timercmp (&rt, &mrt_tv, >))
_rand_rt (&rt, MRT, RAND);
}
+ timerclear (&rt);
+ rs_conn_set_timeout (conn, &rt);
+
rs_debug (("%s: returning %d\n", __func__, r));
return r;
}
+
+struct rs_packet *
+rs_request_get_reqmsg (const struct rs_request *request)
+{
+ assert (request);
+ return request->req_msg;
+}