Change from GNet to HCConn.

[cascardo/rnetproxy.git] / ssl_server.c

diff --git a/ssl_server.c b/ssl_server.c
index d4f79b6..9fa269d 100644 (file)
--- a/ssl_server.c
+++ b/ssl_server.c
@@ -19,7 +19,6 @@
 */
 
 #include <gnutls/gnutls.h>
-#include <gnet.h>
 #include <glib.h>
 #include <string.h>
 #include <errno.h>
@@ -61,11 +60,10 @@ ssl_push (gnutls_transport_ptr_t ptr, const void *buffer, size_t len)
   int r;
   if (ssl->handshaking == TRUE)
     {
-      g_io_channel_write_chars (hook->conn->iochannel, buffer, len,
-                                &r, NULL);
+      r = hc_conn_read (hook->conn, buffer, len);
       return r;
     }
-  gnet_conn_write (hook->conn, (void *) buffer, len);
+  hc_conn_write (hook->conn, (void *) buffer, len);
   return len;
 }
 
@@ -77,8 +75,7 @@ ssl_pull (gnutls_transport_ptr_t ptr, void *buffer, size_t len)
   int r;
   if (ssl->handshaking == TRUE)
     {
-      g_io_channel_read_chars (hook->conn->iochannel, buffer, len,
-                               &r, NULL);
+      r = hc_conn_read (hook->conn, buffer, len);
       return r;
     }
   if (len > ssl->buffer->len)
@@ -126,9 +123,9 @@ ssl_server_close (net_hook_t *hook)
   if (hook->peer)
     {
       hook->peer->peer = NULL;
-      gnet_conn_disconnect (hook->peer->conn);
+      hc_conn_close (hook->peer->conn);
     }
-  gnet_conn_delete (hook->conn);
+  hc_conn_close (hook->conn);
   if (ssl != NULL)
     {
       gnutls_bye (ssl->session, GNUTLS_SHUT_RDWR);
@@ -152,7 +149,7 @@ ssl_server_read (net_hook_t *hook, gchar *buffer, size_t len)
     {
       r = gnutls_record_recv (ssl->session, buffer, len);
       if (r > 0)
-        gnet_conn_write (hook->peer->conn, buffer, r);
+        hc_conn_write (hook->peer->conn, buffer, r);
     } while (r > 0);
 }
 
@@ -163,11 +160,10 @@ ssl_server_error (net_hook_t *hook)
 }
 
 net_hook_t *
-ssl_server_hook_new (net_hook_t *client_hook, char *server, int port)
+ssl_server_hook_new (net_hook_t *client_hook, char *server, char *port)
 {
   net_hook_t *hook;
   hook = g_slice_new (net_hook_t);
-  hook->conn = gnet_conn_new (server, port, nethook_event, hook);
   hook->peer = client_hook;
   hook->server = TRUE;
   hook->connect = ssl_server_connect;
@@ -175,7 +171,6 @@ ssl_server_hook_new (net_hook_t *client_hook, char *server, int port)
   hook->write = ssl_server_write;
   hook->read = ssl_server_read;
   hook->data = ssl_data_new (server);
-  gnet_conn_connect (hook->conn);
-  gnet_conn_read (hook->conn);
+  hook->conn = hc_conn_new (hc_tcp_connect (server, port), nethook_event, hook);
   return hook;
 }