Add asserts to request object.

[radsecproxy.git] / lib / request.c

diff --git a/lib/request.c b/lib/request.c
index 3d4b096..b03d434 100644 (file)
--- a/lib/request.c
+++ b/lib/request.c
@@ -1,6 +1,11 @@
 /* See the file COPYING for licensing information.  */
 
+#if defined HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <time.h>
+#include <assert.h>
 #include <event2/event.h>
 #include <radsec/radsec.h>
 #include <radsec/radsec-impl.h>
@@ -8,9 +13,10 @@
 #include <radsec/request-impl.h>
 
 int
-rs_req_create (struct rs_connection *conn, struct rs_request **req_out)
+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));
@@ -20,10 +26,36 @@ rs_req_create (struct rs_connection *conn, struct rs_request **req_out)
 }
 
 void
-rs_req_destroy(struct rs_request *request)
+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);
 }
 
@@ -35,12 +67,57 @@ _timer_cb(evutil_socket_t fd, short what, void *arg)
 }
 #endif
 
+static void
+_rs_req_connected(void *user_data)
+{
+  //struct rs_request *request = (struct rs_request *)user_data;
+}
+
+static void
+_rs_req_disconnected(void *user_data)
+{
+  //struct rs_request *request = (struct rs_request *)user_data;
+}
+
+static void
+_rs_req_packet_received(struct rs_packet *msg, void *user_data)
+{
+  //struct rs_request *request = (struct rs_request *)user_data;
+}
+
+static void
+_rs_req_packet_sent(void *user_data)
+{
+  //struct rs_request *request = (struct rs_request *)user_data;
+}
+
 int
-rs_req_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)
 {
-  /* install our own callback, backing up any user provided one in
-     req->saved_cb*/
+  int err;
+  struct rs_connection *conn;
+
+  assert (request);
+  assert (request->conn);
+  assert (request->req_msg);
+  conn = request->conn;
+
+  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_msg, request);
+  if (err)
+    goto cleanup;
+
+  err = rs_conn_receive_packet(request->conn, request->req_msg, resp_msg);
+  if (err)
+    goto cleanup;
 
-  return -1;
+cleanup:
+  conn->callbacks = request->saved_cb;
+  return err;
 }