From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: Fri, 3 Jul 2009 04:51:22 +0000 (-0300)
Subject: Use the null hook instead of the ssl hook.
X-Git-Tag: v0.1.3~53
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Frnetproxy.git;a=commitdiff_plain;h=b6441cbcc5e1d36c80ca0167c5a823a96c5ffb5c

Use the null hook instead of the ssl hook.

This will allow us to remove the ssl hook entirely, since it's repeating
code from the ssl connection driver and complicates things more than
necessary.

We lose server port configuration now, but it should be plain easy to
get it back.
---

diff --git a/popproxy.c b/popproxy.c
index 3882f75..4161b92 100644
--- a/popproxy.c
+++ b/popproxy.c
@@ -28,7 +28,6 @@
 #include "log.h"
 #include "nethook.h"
 #include "null.h"
-#include "ssl.h"
 #include "pop.h"
 
 #include "hcconn.h"
@@ -56,7 +55,7 @@ void new_client (int fd, struct sockaddr* addr, socklen_t saddr, gpointer data)
              inet_ntoa (((struct sockaddr_in *) addr)->sin_addr));
   conn = hc_conn_new (NULL, NULL);
   hc_conn_set_driver_channel (conn, fd);
-  hook = ssl_hook_new (conn, address->server, address->port);
+  hook = null_hook_new (conn, address->server);
   pop_hook_new (hook);
 }