-/* 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. */
#include <radsec/radsec-impl.h>
#include <radsec/request.h>
#include <radsec/request-impl.h>
#include <radsec/radsec-impl.h>
#include <radsec/request.h>
#include <radsec/request-impl.h>
if (rs_request_create (conn, &req))
return -1;
if (rs_packet_create_authn_request (conn, &req->req_msg, user_name, user_pw))
return -1;
if (rs_request_create (conn, &req))
return -1;
if (rs_packet_create_authn_request (conn, &req->req_msg, user_name, user_pw))
return -1;
- 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)
{
rs_free (request->conn->ctx, request);
}
static void
_rand_rt (struct timeval *res, uint32_t rtprev, uint32_t factor)
{
struct timeval end = {0,0};
struct timeval now = {0,0};
struct timeval tmp_tv = {0,0};
struct timeval end = {0,0};
struct timeval now = {0,0};
struct timeval tmp_tv = {0,0};
if (!request || !request->conn || !request->req_msg || !resp_msg)
return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL);
if (!request || !request->conn || !request->req_msg || !resp_msg)
return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL);
- 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, >))
{
gettimeofday (&now, NULL);
if (++count > MRC || timercmp (&now, &end, >))
{
- /* 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);
}
_rand_rt (&tmp_tv, IRT, RAND);
timeradd (&rt, &tmp_tv, &rt);
if (timercmp (&rt, &mrt_tv, >))
_rand_rt (&rt, MRT, RAND);
}