Conditionally compile TLS-PSK code (--enable-tls-psk).

[radsecproxy.git] / lib / conn.c

diff --git a/lib/conn.c b/lib/conn.c
index 58290f5..6f7b313 100644 (file)
--- a/lib/conn.c
+++ b/lib/conn.c
@@ -126,19 +126,24 @@ rs_conn_destroy (struct rs_connection *conn)
 
   if (conn->is_connected)
     err = rs_conn_disconnect (conn);
+
+#if defined (RS_ENABLE_TLS)
+  if (conn->tls_ssl) /* FIXME: Free SSL strucxt in rs_conn_disconnect?  */
+    SSL_free (conn->tls_ssl);
+  if (conn->tls_ctx)
+    SSL_CTX_free (conn->tls_ctx);
+#endif
+
   if (conn->tev)
     event_free (conn->tev);
   if (conn->bev)
     bufferevent_free (conn->bev);
-  if (conn->evb)
-    event_base_free (conn->evb);
   if (conn->rev)
     event_free (conn->rev);
   if (conn->wev)
     event_free (conn->wev);
-
-  /* TODO: free tls_ctx  */
-  /* TODO: free tls_ssl  */
+  if (conn->evb)
+    event_base_free (conn->evb);
 
   rs_free (conn->ctx, conn);
 
@@ -247,7 +252,7 @@ rs_conn_receive_packet (struct rs_connection *conn,
                                    "event_add: %s",
                                    evutil_gai_strerror (err));
 
-      /* Activae retransmission timer.  */
+      /* Activate retransmission timer.  */
       conn_activate_timeout (pkt->conn);
     }