Rename COPYING -> LICENSE.

[radsecproxy.git] / lib / tcp.c

diff --git a/lib/tcp.c b/lib/tcp.c
index ce071cd..d0bc62c 100644 (file)
--- a/lib/tcp.c
+++ b/lib/tcp.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>
@@ -12,6 +12,7 @@
 #include <event2/bufferevent_ssl.h>
 #include <openssl/err.h>
 #endif
+#include <radius/client.h>
 #include <radsec/radsec.h>
 #include <radsec/radsec-impl.h>
 #include "tcp.h"
@@ -35,26 +36,19 @@ _read_header (struct rs_packet *pkt)
   if (n == RS_HEADER_LEN)
     {
       pkt->flags |= rs_packet_hdr_read_flag;
-      pkt->rpkt->data_len = (pkt->hdr[2] << 8) + pkt->hdr[3];
-      if (pkt->rpkt->data_len < 20 || pkt->rpkt->data_len > 4096)
+      pkt->rpkt->length = (pkt->hdr[2] << 8) + pkt->hdr[3];
+      if (pkt->rpkt->length < 20 || pkt->rpkt->length > RS_MAX_PACKET_LEN)
        {
          conn_close (&pkt->conn);
          return rs_err_conn_push (pkt->conn, RSE_INVALID_PKT,
                                   "invalid packet length: %d",
-                                  pkt->rpkt->data_len);
-       }
-      pkt->rpkt->data = rs_malloc (pkt->conn->ctx, pkt->rpkt->data_len);
-      if (!pkt->rpkt->data)
-       {
-         conn_close (&pkt->conn);
-         return rs_err_conn_push_fl (pkt->conn, RSE_NOMEM, __FILE__, __LINE__,
-                                     NULL);
+                                  pkt->rpkt->length);
        }
       memcpy (pkt->rpkt->data, pkt->hdr, RS_HEADER_LEN);
       bufferevent_setwatermark (pkt->conn->bev, EV_READ,
-                               pkt->rpkt->data_len - RS_HEADER_LEN, 0);
+                               pkt->rpkt->length - RS_HEADER_LEN, 0);
       rs_debug (("%s: packet header read, total pkt len=%d\n",
-                __func__, pkt->rpkt->data_len));
+                __func__, pkt->rpkt->length));
     }
   else if (n < 0)
     {
@@ -74,17 +68,18 @@ static int
 _read_packet (struct rs_packet *pkt)
 {
   size_t n = 0;
+  int err;
 
   rs_debug (("%s: trying to read %d octets of packet data\n", __func__,
-            pkt->rpkt->data_len - RS_HEADER_LEN));
+            pkt->rpkt->length - RS_HEADER_LEN));
 
   n = bufferevent_read (pkt->conn->bev,
                        pkt->rpkt->data + RS_HEADER_LEN,
-                       pkt->rpkt->data_len - RS_HEADER_LEN);
+                       pkt->rpkt->length - RS_HEADER_LEN);
 
   rs_debug (("%s: read %ld octets of packet data\n", __func__, n));
 
-  if (n == pkt->rpkt->data_len - RS_HEADER_LEN)
+  if (n == pkt->rpkt->length - RS_HEADER_LEN)
     {
       bufferevent_disable (pkt->conn->bev, EV_READ);
       rs_debug (("%s: complete packet read\n", __func__));
@@ -96,11 +91,12 @@ _read_packet (struct rs_packet *pkt)
         - invalid code field
         - attribute lengths >= 2
         - attribute sizes adding up correctly  */
-      if (!rad_packet_ok (pkt->rpkt, 0))
+      err = nr_packet_ok (pkt->rpkt);
+      if (err != RSE_OK)
        {
          conn_close (&pkt->conn);
-         return rs_err_conn_push_fl (pkt->conn, RSE_FR, __FILE__, __LINE__,
-                                     "invalid packet: %s", fr_strerror ());
+         return rs_err_conn_push_fl (pkt->conn, err, __FILE__, __LINE__,
+                                     "invalid packet");
        }
 
 #if defined (DEBUG)
@@ -123,7 +119,7 @@ _read_packet (struct rs_packet *pkt)
     rs_debug (("%s: buffer frozen when reading packet\n", __func__));
   else                         /* Short packet.  */
     rs_debug (("%s: waiting for another %d octets\n", __func__,
-              pkt->rpkt->data_len - RS_HEADER_LEN - n));
+              pkt->rpkt->length - RS_HEADER_LEN - n));
 
   return 0;
 }
@@ -158,24 +154,32 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data)
 {
   struct rs_packet *pkt = (struct rs_packet *) user_data;
   struct rs_connection *conn = NULL;
-  struct rs_peer *p = NULL;
   int sockerr = 0;
 #if defined (RS_ENABLE_TLS)
   unsigned long tlserr = 0;
 #endif
+#if defined (DEBUG)
+  struct rs_peer *p = NULL;
+#endif
 
   assert (pkt);
   assert (pkt->conn);
-  assert (pkt->conn->active_peer);
   conn = pkt->conn;
+#if defined (DEBUG)
+  assert (pkt->conn->active_peer);
   p = conn->active_peer;
+#endif
 
   conn->is_connecting = 0;
   if (events & BEV_EVENT_CONNECTED)
     {
       if (conn->tev)
        evtimer_del (conn->tev); /* Cancel connect timer.  */
-      event_on_connect (conn, pkt);
+      if (event_on_connect (conn, pkt))
+        {
+          event_on_disconnect (conn);
+          event_loopbreak (conn);
+        }
     }
   else if (events & BEV_EVENT_EOF)
     {
@@ -185,7 +189,7 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data)
     {
       rs_debug (("%s: %p times out on %s\n", __func__, p,
                 (events & BEV_EVENT_READING) ? "read" : "write"));
-      rs_err_conn_push_fl (pkt->conn, RSE_TIMEOUT_IO, __FILE__, __LINE__, NULL);
+      rs_err_conn_push_fl (conn, RSE_TIMEOUT_IO, __FILE__, __LINE__, NULL);
     }
   else if (events & BEV_EVENT_ERROR)
     {
@@ -193,13 +197,13 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data)
       if (sockerr == 0)        /* FIXME: True that errno == 0 means closed? */
        {
          event_on_disconnect (conn);
-         rs_err_conn_push_fl (pkt->conn, RSE_DISCO, __FILE__, __LINE__, NULL);
+         rs_err_conn_push_fl (conn, RSE_DISCO, __FILE__, __LINE__, NULL);
        }
       else
        {
          rs_debug (("%s: %d: %d (%s)\n", __func__, conn->fd, sockerr,
                     evutil_socket_error_to_string (sockerr)));
-         rs_err_conn_push_fl (pkt->conn, RSE_SOCKERR, __FILE__, __LINE__,
+         rs_err_conn_push_fl (conn, RSE_SOCKERR, __FILE__, __LINE__,
                               "%d: %d (%s)", conn->fd, sockerr,
                               evutil_socket_error_to_string (sockerr));
        }
@@ -212,7 +216,7 @@ tcp_event_cb (struct bufferevent *bev, short events, void *user_data)
            {
              rs_debug (("%s: openssl error: %s\n", __func__,
                         ERR_error_string (tlserr, NULL)));
-             rs_err_conn_push_fl (pkt->conn, RSE_SSLERR, __FILE__, __LINE__,
+             rs_err_conn_push_fl (conn, RSE_SSLERR, __FILE__, __LINE__,
                                   ERR_error_string (tlserr, NULL));
            }
        }