Add two helper functions to conn.[ch].

[libradsec.git] / lib / conn.c

diff --git a/lib/conn.c b/lib/conn.c
index c6692a2..7522782 100644 (file)
--- a/lib/conn.c
+++ b/lib/conn.c
@@ -43,6 +43,40 @@ conn_user_dispatch_p (const struct rs_connection *conn)
          conn->callbacks.sent_cb);
 }
 
+
+int
+conn_activate_timeout (struct rs_connection *conn)
+{
+  assert (conn);
+  assert (conn->tev);
+  assert (conn->evb);
+  if (conn->timeout.tv_sec || conn->timeout.tv_usec)
+    {
+      rs_debug (("%s: activating timer: %d.%d\n", __func__,
+                conn->timeout.tv_sec, conn->timeout.tv_usec));
+      if (evtimer_add (conn->tev, &conn->timeout))
+       return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
+                                   "evtimer_add: %d", errno);
+    }
+  return RSE_OK;
+}
+
+int
+conn_type_tls (const struct rs_connection *conn)
+{
+  return conn->realm->type == RS_CONN_TYPE_TLS
+    || conn->realm->type == RS_CONN_TYPE_DTLS;
+}
+
+int
+conn_cred_psk (const struct rs_connection *conn)
+{
+  return conn->realm->transport_cred &&
+    conn->realm->transport_cred->type == RS_CRED_TLS_PSK;
+}
+
+
+/* Public functions. */
 int
 rs_conn_create (struct rs_context *ctx,
                struct rs_connection **conn,
@@ -207,7 +241,7 @@ _rcb (struct rs_packet *packet, void *user_data)
   assert (pkt);
   assert (pkt->conn);
 
-  pkt->flags |= rs_packet_received_flag;
+  pkt->flags |= RS_PACKET_RECEIVED;
   if (pkt->conn->bev)
     bufferevent_disable (pkt->conn->bev, EV_WRITE|EV_READ);
   else
@@ -234,7 +268,7 @@ rs_conn_receive_packet (struct rs_connection *conn,
 
   conn->callbacks.received_cb = _rcb;
   conn->user_data = pkt;
-  pkt->flags &= ~rs_packet_received_flag;
+  pkt->flags &= ~RS_PACKET_RECEIVED;
 
   if (conn->bev)               /* TCP.  */
     {
@@ -267,7 +301,7 @@ rs_conn_receive_packet (struct rs_connection *conn,
                                evutil_gai_strerror (err));
   rs_debug (("%s: event loop done\n", __func__));
 
-  if ((pkt->flags & rs_packet_received_flag) == 0
+  if ((pkt->flags & RS_PACKET_RECEIVED) == 0
       || (req_msg
          && packet_verify_response (pkt->conn, pkt, req_msg) != RSE_OK))
     {
@@ -290,20 +324,3 @@ rs_conn_set_timeout(struct rs_connection *conn, struct timeval *tv)
   assert (tv);
   conn->timeout = *tv;
 }
-
-int
-conn_activate_timeout (struct rs_connection *conn)
-{
-  assert (conn);
-  assert (conn->tev);
-  assert (conn->evb);
-  if (conn->timeout.tv_sec || conn->timeout.tv_usec)
-    {
-      rs_debug (("%s: activating timer: %d.%d\n", __func__,
-                conn->timeout.tv_sec, conn->timeout.tv_usec));
-      if (evtimer_add (conn->tev, &conn->timeout))
-       return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
-                                   "evtimer_add: %d", errno);
-    }
-  return RSE_OK;
-}