Rename COPYING -> LICENSE.

[libradsec.git] / lib / send.c

diff --git a/lib/send.c b/lib/send.c
index cc7fd71..6b887c5 100644 (file)
--- a/lib/send.c
+++ b/lib/send.c
@@ -1,5 +1,5 @@
 /* Copyright 2011 NORDUnet A/S. All rights reserved.
-   See the file COPYING for licensing information.  */
+   See LICENSE for licensing information.  */
 
 #if defined HAVE_CONFIG_H
 #include <config.h>
@@ -18,12 +18,6 @@
 #include "tcp.h"
 #include "udp.h"
 
-/* RFC 5080 2.2.1.  Retransmission Behavior */
-#define IRT 2
-#define MRC 5
-#define MRT 16
-#define MRD 30
-
 static int
 _conn_open (struct rs_connection *conn, struct rs_packet *pkt)
 {
@@ -41,6 +35,8 @@ _conn_open (struct rs_connection *conn, struct rs_packet *pkt)
   if (conn->realm->type == RS_CONN_TYPE_TCP
       || conn->realm->type == RS_CONN_TYPE_TLS)
     {
+      if (tcp_init_connect_timer (conn))
+       return -1;
       if (event_init_bufferevent (conn, conn->active_peer))
        return -1;
     }
@@ -48,6 +44,8 @@ _conn_open (struct rs_connection *conn, struct rs_packet *pkt)
     {
       if (udp_init (conn, pkt))
        return -1;
+      if (udp_init_retransmit_timer (conn))
+       return -1;
     }
 
   if (!conn->is_connected)
@@ -105,6 +103,8 @@ rs_packet_send (struct rs_packet *pkt, void *user_data)
     }
   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);
       if (err < 0)
        return rs_err_conn_push_fl (conn, RSE_EVENT, __FILE__, __LINE__,
@@ -128,7 +128,10 @@ rs_packet_send (struct rs_packet *pkt, void *user_data)
       conn->user_data = NULL;
 
       if ((pkt->flags & rs_packet_sent_flag) == 0)
-       return -1;
+       {
+         assert (rs_err_conn_peek_code (conn));
+         return rs_err_conn_peek_code (conn);
+       }
     }
 
   return RSE_OK;