Formatting changes.

[radsecproxy.git] / lib / request.c

diff --git a/lib/request.c b/lib/request.c
index 5cb87bb..80a0a81 100644 (file)
--- a/lib/request.c
+++ b/lib/request.c
@@ -1,4 +1,9 @@
-/* See the file COPYING for licensing information.  */
+/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
+   See the file COPYING for licensing information.  */
+
+#if defined HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <time.h>
 #include <assert.h>
@@ -12,6 +17,7 @@ int
 rs_request_create (struct rs_connection *conn, struct rs_request **req_out)
 {
   struct rs_request *req = rs_malloc (conn->ctx, sizeof(*req));
+  assert (req_out);
   if (!req)
     return rs_err_conn_push_fl (conn, RSE_NOMEM, __FILE__, __LINE__, NULL);
   memset (req, 0, sizeof(*req));
@@ -21,73 +27,116 @@ rs_request_create (struct rs_connection *conn, struct rs_request **req_out)
 }
 
 void
+rs_request_add_reqpkt (struct rs_request *req, struct rs_packet *reqpkt)
+{
+  assert (req);
+  req->req_msg = reqpkt;
+}
+
+int
+rs_request_create_authn (struct rs_connection *conn,
+                        struct rs_request **req_out,
+                        const char *user_name,
+                        const char *user_pw)
+{
+  struct rs_request *req;
+  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;
+  return RSE_OK;
+}
+
+void
 rs_request_destroy (struct rs_request *request)
 {
-  rs_packet_destroy (request->req);
-  rs_packet_destroy (request->resp);
+  assert (request);
+  rs_packet_destroy (request->req_msg);
+  rs_packet_destroy (request->resp_msg);
   rs_free (request->conn->ctx, request);
 }
 
 #if 0
 static void
-_timer_cb(evutil_socket_t fd, short what, void *arg)
+_timer_cb (evutil_socket_t fd, short what, void *arg)
 
 {
 }
 #endif
 
 static void
-_rs_req_connected(void *user_data)
+_rs_req_connected (void *user_data)
 {
-  struct rs_request *request = (struct rs_request *)user_data;
+  struct rs_request *request = (struct rs_request *) user_data;
+  assert (request);
+  assert (request->conn);
+  if (request->saved_cb.connected_cb)
+    request->saved_cb.connected_cb (request->saved_user_data);
 }
 
 static void
-_rs_req_disconnected(void *user_data)
+_rs_req_disconnected (void *user_data)
 {
-  struct rs_request *request = (struct rs_request *)user_data;
+  struct rs_request *request = (struct rs_request *) user_data;
+  assert (request);
+  assert (request->conn);
+  if (request->saved_cb.disconnected_cb)
+    request->saved_cb.disconnected_cb (request->saved_user_data);
 }
 
 static void
-_rs_req_packet_received(const struct rs_packet *pkt, void *user_data)
+_rs_req_packet_received (struct rs_packet *msg, void *user_data)
 {
-  struct rs_request *request = (struct rs_request *)user_data;
+  struct rs_request *request = (struct rs_request *) user_data;
+  assert (request);
+  assert (request->conn);
+  if (request->saved_cb.received_cb)
+    request->saved_cb.received_cb (msg, request->saved_user_data);
 }
 
 static void
-_rs_req_packet_sent(void *user_data)
+_rs_req_packet_sent (void *user_data)
 {
-  struct rs_request *request = (struct rs_request *)user_data;
+  struct rs_request *request = (struct rs_request *) user_data;
+  assert (request);
+  assert (request->conn);
+  if (request->saved_cb.sent_cb)
+    request->saved_cb.sent_cb (request->saved_user_data);
 }
 
 int
-rs_request_send(struct rs_request *request, struct rs_packet *req,
-               struct rs_packet **resp)
+rs_request_send (struct rs_request *request, struct rs_packet **resp_msg)
 {
-  int err;
-  struct rs_connection *conn;
+  int err = 0;
+  struct rs_connection *conn = NULL;
 
-  assert (request);
-  assert (request->conn);
+  if (!request || !request->conn || !request->req_msg || !resp_msg)
+    return rs_err_conn_push_fl (conn, RSE_INVAL, __FILE__, __LINE__, NULL);
   conn = request->conn;
 
-  request->req = req;          /* take ownership */
-  request->saved_cb = conn->callbacks;
+  request->saved_user_data = conn->user_data;
+  conn->user_data = request;
 
+  request->saved_cb = conn->callbacks;
   conn->callbacks.connected_cb = _rs_req_connected;
   conn->callbacks.disconnected_cb = _rs_req_disconnected;
   conn->callbacks.received_cb = _rs_req_packet_received;
   conn->callbacks.sent_cb = _rs_req_packet_sent;
 
-  err = rs_packet_send(request->req, request);
+  err = rs_packet_send (request->req_msg, request);
   if (err)
     goto cleanup;
 
-  err = rs_conn_receive_packet(request->conn, request->req, resp);
+  err = rs_conn_receive_packet (request->conn, request->req_msg, resp_msg);
   if (err)
     goto cleanup;
 
 cleanup:
+  conn->user_data = request->saved_user_data;
   conn->callbacks = request->saved_cb;
   return err;
 }