Allow set_driver to fail and handle this case.

[cascardo/rnetproxy.git] / hcconn_ssl.c

diff --git a/hcconn_ssl.c b/hcconn_ssl.c
index 0100757..264be27 100644 (file)
--- a/hcconn_ssl.c
+++ b/hcconn_ssl.c
@@ -46,9 +46,11 @@ ssl_client_session_new (gnutls_session_t *session)
 }
 
 static struct ssl_data *
-ssl_data_new_client (void)
+ssl_data_new (int server)
 {
   struct ssl_data *ssl;
+  if (server)
+    return NULL;
   ssl = g_slice_new (struct ssl_data);
   ssl_client_session_new (&ssl->session);
   ssl->buffer = g_string_sized_new (4096);
@@ -183,10 +185,13 @@ hc_conn_ssl_watch (HCConn *conn, HCEvent event, gpointer data)
     }
 }
 
-void
-hc_conn_set_driver_ssl_client (HCConn *conn, HCConn *lowconn)
+static int
+hc_conn_set_driver_ssl (HCConn *conn, HCConn *lowconn, int server)
 {
-  struct ssl_data *ssl = ssl_data_new_client ();
+  struct ssl_data *ssl;
+  ssl = ssl_data_new (server);
+  if (ssl == NULL)
+    return -1;
   ssl->lowconn = lowconn;
   conn->layer = ssl;
   conn->read = hc_conn_ssl_read;
@@ -194,4 +199,11 @@ hc_conn_set_driver_ssl_client (HCConn *conn, HCConn *lowconn)
   conn->close = hc_conn_ssl_close;
   hc_conn_set_callback (lowconn, hc_conn_ssl_watch, conn);
   ssl_server_connect (conn);
+  return 0;
+}
+
+int
+hc_conn_set_driver_ssl_client (HCConn *conn, HCConn *lowconn)
+{
+  return hc_conn_set_driver_ssl (conn, lowconn, 0);
 }