projects
/
radsecproxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename COPYING -> LICENSE.
[radsecproxy.git]
/
lib
/
conn.c
diff --git
a/lib/conn.c
b/lib/conn.c
index
58290f5
..
c6692a2
100644
(file)
--- a/
lib/conn.c
+++ b/
lib/conn.c
@@
-1,11
+1,13
@@
/* Copyright 2010, 2011 NORDUnet A/S. All rights reserved.
/* Copyright 2010, 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>
#endif
#include <string.h>
#if defined HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
#include <assert.h>
#include <event2/event.h>
#include <event2/bufferevent.h>
#include <assert.h>
#include <event2/event.h>
#include <event2/bufferevent.h>
@@
-126,19
+128,24
@@
rs_conn_destroy (struct rs_connection *conn)
if (conn->is_connected)
err = rs_conn_disconnect (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->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);
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);
rs_free (conn->ctx, conn);
@@
-217,7
+224,7
@@
rs_conn_receive_packet (struct rs_connection *conn,
assert (conn);
assert (conn->realm);
assert (conn);
assert (conn->realm);
- assert (!conn_user_dispatch_p (conn)); /*
Dispatch
ing mode only. */
+ assert (!conn_user_dispatch_p (conn)); /*
Block
ing mode only. */
if (rs_packet_create (conn, &pkt))
return -1;
if (rs_packet_create (conn, &pkt))
return -1;
@@
-247,7
+254,7
@@
rs_conn_receive_packet (struct rs_connection *conn,
"event_add: %s",
evutil_gai_strerror (err));
"event_add: %s",
evutil_gai_strerror (err));
- /* Activae retransmission timer. */
+ /* Activa
t
e retransmission timer. */
conn_activate_timeout (pkt->conn);
}
conn_activate_timeout (pkt->conn);
}
@@
-264,7
+271,10
@@
rs_conn_receive_packet (struct rs_connection *conn,
|| (req_msg
&& packet_verify_response (pkt->conn, pkt, req_msg) != RSE_OK))
{
|| (req_msg
&& packet_verify_response (pkt->conn, pkt, req_msg) != RSE_OK))
{
- assert (rs_err_conn_peek_code (pkt->conn));
+ if (rs_err_conn_peek_code (pkt->conn) == RSE_OK)
+ /* No packet and no error on the stack _should_ mean that the
+ server hung up on us. */
+ rs_err_conn_push (pkt->conn, RSE_DISCO, "no response");
return rs_err_conn_peek_code (conn);
}
return rs_err_conn_peek_code (conn);
}