Stop rs_request_send() from leaking RSE_TIMEOUT_CONN and RSE_TIMEOUT_IO.

[radsecproxy.git] / lib / request.c

diff --git a/lib/request.c b/lib/request.c
index c74ed92..40ac56d 100644 (file)
--- a/lib/request.c
+++ b/lib/request.c
@@ -1,5 +1,5 @@
-/* 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>
@@ -14,7 +14,7 @@
 #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"
@@ -53,15 +53,17 @@ rs_request_create_authn (struct rs_connection *conn,
                         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;
 }
 
@@ -69,15 +71,18 @@ void
 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;
 }
@@ -114,17 +119,19 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg)
                                      resp_msg);
          if (r == RSE_OK)
            break;              /* Success.  */
-
-         if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO)
-           break;              /* Error.  */
        }
-      else if (r != RSE_TIMEOUT_CONN && r != RSE_TIMEOUT_IO)
+      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.  */
        }
 
@@ -142,3 +149,10 @@ rs_request_send (struct rs_request *request, struct rs_packet **resp_msg)
   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;
+}