Split code so we can reuse it without copying it.

[cascardo/rnetproxy.git] / hcconn_ssl.c

diff --git a/hcconn_ssl.c b/hcconn_ssl.c
index 5956acc..0a4f885 100644 (file)
--- a/hcconn_ssl.c
+++ b/hcconn_ssl.c
@@ -33,18 +33,26 @@ struct ssl_data
   gpointer lowconn;
 };
 
-static struct ssl_data *
-ssl_data_new (void)
+static void
+ssl_client_session_new (gnutls_session_t *session)
 {
-  struct ssl_data *ssl;
   int kx_prio[] = {GNUTLS_KX_RSA, 0};
   gnutls_certificate_credentials cred;
   gnutls_certificate_allocate_credentials (&cred);
+  gnutls_init (session, GNUTLS_CLIENT);
+  gnutls_set_default_priority (*session);
+  gnutls_kx_set_priority (*session, kx_prio);
+  gnutls_credentials_set (*session, GNUTLS_CRD_CERTIFICATE, cred);
+}
+
+static struct ssl_data *
+ssl_data_new (int server)
+{
+  struct ssl_data *ssl;
+  if (server)
+    return NULL;
   ssl = g_slice_new (struct ssl_data);
-  gnutls_init (&ssl->session, GNUTLS_CLIENT);
-  gnutls_set_default_priority (ssl->session);
-  gnutls_kx_set_priority (ssl->session, kx_prio);
-  gnutls_credentials_set (ssl->session, GNUTLS_CRD_CERTIFICATE, cred);
+  ssl_client_session_new (&ssl->session);
   ssl->buffer = g_string_sized_new (4096);
   ssl->handshaking = FALSE;
   return ssl;
@@ -158,24 +166,30 @@ hc_conn_ssl_watch (HCConn *conn, HCEvent event, gpointer data)
   HCConn *ssl_conn = data;
   struct ssl_data *ssl = ssl_conn->layer;
   int r;
-  if (event != HC_EVENT_READ)
-    return;
-  if (ssl->handshaking)
+  switch (event)
     {
-      ssl_server_handshake (ssl);
-      return;
+    case HC_EVENT_READ:
+      if (ssl->handshaking)
+        {
+          ssl_server_handshake (ssl);
+          return;
+        }
+      while ((r = hc_conn_read (ssl->lowconn, buffer, sizeof (buffer))) > 0)
+        g_string_append_len (ssl->buffer, buffer, r);
+      if (ssl_conn->func && !ssl->handshaking)
+        ssl_conn->func (ssl_conn, event, ssl_conn->data);
+      break;
+    case HC_EVENT_CLOSE:
+      if (ssl_conn->func)
+        ssl_conn->func (ssl_conn, event, ssl_conn->data);
     }
-  while ((r = hc_conn_read (ssl->lowconn, buffer, sizeof (buffer))) > 0)
-    g_string_append_len (ssl->buffer, buffer, r);
-  if (ssl_conn->func && !ssl->handshaking)
-    ssl_conn->func (ssl_conn, event, ssl_conn->data);
-  return;
 }
 
-void
-hc_conn_set_driver_ssl (HCConn *conn, HCConn *lowconn)
+static void
+hc_conn_set_driver_ssl (HCConn *conn, HCConn *lowconn, int server)
 {
-  struct ssl_data *ssl = ssl_data_new ();
+  struct ssl_data *ssl;
+  ssl = ssl_data_new (server);
   ssl->lowconn = lowconn;
   conn->layer = ssl;
   conn->read = hc_conn_ssl_read;
@@ -184,3 +198,8 @@ hc_conn_set_driver_ssl (HCConn *conn, HCConn *lowconn)
   hc_conn_set_callback (lowconn, hc_conn_ssl_watch, conn);
   ssl_server_connect (conn);
 }
+
+void hc_conn_set_driver_ssl_client (HCConn *conn, HCConn *lowconn)
+{
+  hc_conn_set_driver_ssl (conn, lowconn, 0);
+}