1 files changed, 41 insertions, 38 deletions

diff --git a/lib/send.c b/lib/send.c
index 3161bbe..34d1c70 100644
--- a/lib/send.c
+++ b/lib/send.c
@@ -11,7 +11,7 @@
 #include <radsec/radsec.h>
 #include <radsec/radsec-impl.h>
 #include "debug.h"
-#include "packet.h"
+#include "message.h"
 #include "event.h"
 #include "peer.h"
 #include "conn.h"
@@ -19,9 +19,9 @@
 #include "udp.h"
 
 static int
-_conn_open (struct rs_connection *conn, struct rs_packet *pkt)
+_conn_open (struct rs_connection *conn, struct rs_message *msg)
 {
-  if (event_init_eventbase (conn))
+  if (event_init_eventbase (TO_BASE_CONN (conn)))
     return -1;
 
   if (!conn->active_peer)
@@ -29,28 +29,28 @@ _conn_open (struct rs_connection *conn, struct rs_packet *pkt)
   if (!conn->active_peer)
     return rs_err_conn_push_fl (conn, RSE_NOPEER, __FILE__, __LINE__, NULL);
 
-  if (event_init_socket (conn, conn->active_peer))
+  if (event_init_socket (&conn->base_, conn->active_peer))
     return -1;
 
-  if (conn->realm->type == RS_CONN_TYPE_TCP
-      || conn->realm->type == RS_CONN_TYPE_TLS)
+  if (conn->base_.realm->type == RS_CONN_TYPE_TCP
+      || conn->base_.realm->type == RS_CONN_TYPE_TLS)
     {
       if (tcp_init_connect_timer (conn))
 	return -1;
-      if (event_init_bufferevent (conn, conn->active_peer))
+      if (event_init_bufferevent (conn))
 	return -1;
     }
   else
     {
-      if (udp_init (conn, pkt))
+      if (udp_init (conn, msg))
 	return -1;
       if (udp_init_retransmit_timer (conn))
 	return -1;
     }
 
-  if (!conn->is_connected)
-    if (!conn->is_connecting)
-      event_do_connect (conn);
+  if (conn->state != RS_CONN_STATE_CONNECTED
+      && conn->state != RS_CONN_STATE_CONNECTING)
+    event_do_connect (conn);
 
   return RSE_OK;
 }
@@ -58,54 +58,56 @@ _conn_open (struct rs_connection *conn, struct rs_packet *pkt)
 static int
 _conn_is_open_p (struct rs_connection *conn)
 {
-  return conn->active_peer && conn->is_connected;
+  return conn->state == RS_CONN_STATE_CONNECTED
+    && conn->active_peer != NULL;
 }
 
 /* User callback used when we're dispatching for user.  */
 static void
 _wcb (void *user_data)
 {
-  struct rs_packet *pkt = (struct rs_packet *) user_data;
-  assert (pkt);
-  pkt->flags |= RS_PACKET_SENT;
-  if (pkt->conn->bev)
-    bufferevent_disable (pkt->conn->bev, EV_WRITE|EV_READ);
+  struct rs_message *msg = (struct rs_message *) user_data;
+  assert (msg);
+  msg->flags |= RS_MESSAGE_SENT;
+  if (msg->conn->base_.bev)
+    bufferevent_disable (msg->conn->base_.bev, EV_WRITE|EV_READ);
   else
-    event_del (pkt->conn->wev);
+    event_del (msg->conn->base_.wev);
 }
 
 int
-rs_packet_send (struct rs_packet *pkt, void *user_data)
+rs_message_send (struct rs_message *msg)
 {
   struct rs_connection *conn = NULL;
   int err = 0;
 
-  assert (pkt);
-  assert (pkt->conn);
-  conn = pkt->conn;
+  assert (msg);
+  assert (msg->conn);
+  conn = msg->conn;
 
   if (_conn_is_open_p (conn))
-    packet_do_send (pkt);
+    message_do_send (msg);
   else
-    if (_conn_open (conn, pkt))
+    if (_conn_open (conn, msg))
       return -1;
 
-  assert (conn->evb);
+  assert (conn->base_.ctx);
+  assert (conn->base_.ctx->evb);
   assert (conn->active_peer);
-  assert (conn->fd >= 0);
+  assert (conn->base_.fd >= 0);
 
-  conn->user_data = user_data;
-
-  if (conn->bev)		/* TCP */
+  if (conn->base_.bev)		/* TCP */
     {
-      bufferevent_setcb (conn->bev, NULL, tcp_write_cb, tcp_event_cb, pkt);
-      bufferevent_enable (conn->bev, EV_WRITE);
+      bufferevent_setcb (conn->base_.bev, NULL, tcp_write_cb, tcp_event_cb,
+                         msg);
+      bufferevent_enable (conn->base_.bev, EV_WRITE);
     }
   else				/* UDP */
     {
-      event_assign (conn->wev, conn->evb, event_get_fd (conn->wev),
-		    EV_WRITE, event_get_callback (conn->wev), pkt);
-      err = event_add (conn->wev, NULL);
+      event_assign (conn->base_.wev, conn->base_.ctx->evb,
+                    event_get_fd (conn->base_.wev),
+		    EV_WRITE, event_get_callback (conn->base_.wev), msg);
+      err = event_add (conn->base_.wev, NULL);
       if (err < 0)
 	return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
 				    "event_add: %s",
@@ -115,19 +117,20 @@ rs_packet_send (struct rs_packet *pkt, void *user_data)
   /* Do dispatch, unless the user wants to do it herself.  */
   if (!conn_user_dispatch_p (conn))
     {
+      /* Blocking mode. */
       conn->callbacks.sent_cb = _wcb;
-      conn->user_data = pkt;
+      conn->base_.user_data = msg;
       rs_debug (("%s: entering event loop\n", __func__));
-      err = event_base_dispatch (conn->evb);
+      err = event_base_dispatch (conn->base_.ctx->evb);
       if (err < 0)
 	return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
 				    "event_base_dispatch: %s",
 				    evutil_gai_strerror (err));
       rs_debug (("%s: event loop done\n", __func__));
       conn->callbacks.sent_cb = NULL;
-      conn->user_data = NULL;
+      conn->base_.user_data = NULL;
 
-      if ((pkt->flags & RS_PACKET_SENT) == 0)
+      if ((msg->flags & RS_MESSAGE_SENT) == 0)
 	{
 	  assert (rs_err_conn_peek_code (conn));
 	  return rs_err_conn_peek_code (conn);