Check for driver methods before calling them and reset them on close.

[cascardo/rnetproxy.git] / popproxy.c

diff --git a/popproxy.c b/popproxy.c
index 3a9a2d3..99a2352 100644 (file)
--- a/popproxy.c
+++ b/popproxy.c
@@ -19,97 +19,160 @@
 */
 
 #include <glib.h>
-#include <gnet.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <gnutls/gnutls.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #include "log.h"
 #include "nethook.h"
 #include "null.h"
-#include "ssl.h"
+#include "pop.h"
+
+#include "hcconn.h"
+#include "tcp_connect.h"
 
 #define CONFFILE SYSCONFDIR "/popproxy.conf"
 
-void new_client (GServer* server, GConn* conn, gpointer data)
+struct pop_address
+{
+  char *server;
+  char *port;
+};
+
+static void
+new_client (int fd, struct sockaddr *addr, socklen_t saddr, gpointer data)
 {
-  net_hook_t* hook;
-  if (conn == NULL)
+  HCConn *conn;
+  net_hook_t *hook;
+  struct pop_address *address = data;
+  if (fd < 0)
     {
       g_critical ("Server has received an error event.");
       return;
     }
-  g_message ("Received connection from %s.", conn->hostname);
-  hook = ssl_hook_new (conn, data);
-  gnet_conn_read (conn);
+  g_message ("Received connection from %s.",
+             inet_ntoa (((struct sockaddr_in *) addr)->sin_addr));
+  conn = hc_conn_new (NULL, NULL);
+  hc_conn_set_driver_channel (conn, fd);
+  hook = null_hook_new (conn, address->server, address->port);
+  pop_hook_new (hook);
 }
 
-static gchar* configfile;
+static gchar *configfile;
+static gboolean foreground;
 
 static GOptionEntry opt_entries[] =
   {
     { "config-file", 'c', 0, G_OPTION_ARG_FILENAME, &configfile,
       "Configuration file location", "file" },
+    { "foreground", 'f', 0, G_OPTION_ARG_NONE, &foreground,
+      "Run in foreground", 0 },
     { NULL }
   };
 
-int main (int argc, char** argv)
+int main (int argc, char **argv)
 {
 
-  GOptionContext* opt_ctx;
+  GOptionContext *opt_ctx;
   GKeyFile *keyfile;
-  GInetAddr* inetaddr;
   GError *error;
-  gchar* conf_address;
-  gint port;
+  int server_fd;
+  gchar *conf_address;
+  gchar *port;
   gchar *server_address;
+  gchar *server_port;
+  struct pop_address pop_address;
 
   gnutls_global_init ();
-  gnet_init ();
-  pop_log_init ();
 
   configfile = CONFFILE;
   opt_ctx = g_option_context_new ("");
   g_option_context_add_main_entries (opt_ctx, opt_entries, NULL);
-  if (!g_option_context_parse (opt_ctx, &argc, &argv, NULL))
+
+  error = NULL;
+  if (!g_option_context_parse (opt_ctx, &argc, &argv, &error))
     {
-      g_log (NULL, G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL,
-            "Could not parse command line options.");
+      g_critical ("Could not parse command line options: %s.",
+                  error->message);
+      g_error_free (error);
+      exit (1);
     }
   g_option_context_free (opt_ctx);
   
-  keyfile =  g_key_file_new ();
+  keyfile = g_key_file_new ();
 
   error = NULL;
   if (g_key_file_load_from_file (keyfile, configfile,
                                  G_KEY_FILE_NONE, &error) == FALSE)
     {
-      fprintf (stderr, "Could not load configuration file %s: %s.\n",
-               configfile, error->message);
+      g_critical ("Could not load configuration file %s: %s.",
+                  configfile, error->message);
       g_error_free (error);
       exit (1);
     }
 
-  conf_address = g_key_file_get_string (keyfile, "global", "address", NULL);
-  port = g_key_file_get_integer (keyfile, "global", "port", NULL);
-  server_address = g_key_file_get_string (keyfile, "global", "server", NULL);
+  error = NULL;
+  conf_address = g_key_file_get_string (keyfile, "global", "address",
+                                        &error);
+  if (conf_address == NULL && error != NULL)
+    {
+      conf_address = g_strdup ("0.0.0.0");
+      g_error_free (error);
+    }
+  error = NULL;
+  port = g_key_file_get_string (keyfile, "global", "port", &error);
+  if (port == NULL && error != NULL)
+    {
+      port = g_strdup ("110");
+      g_error_free (error);
+    }
+  error = NULL;
+  server_address = g_key_file_get_string (keyfile, "global", "server",
+                                          &error);
+  if (server_address == NULL && error != NULL)
+    {
+      server_address = g_strdup ("127.0.0.1");
+      g_error_free (error);
+    }
+  error = NULL;
+  server_port = g_key_file_get_string (keyfile, "global", "server_port",
+                                       &error);
+  if (server_port == NULL && error != NULL)
+    {
+      server_port = g_strdup ("995");
+      g_error_free (error);
+    }
 
-  inetaddr = gnet_inetaddr_new_nonblock (conf_address, port);
-  if (gnet_server_new (inetaddr, port,
-                       new_client, server_address) == NULL)
+  pop_address.server = server_address;
+  pop_address.port = server_port;
+
+  server_fd = hc_tcp_server (port);
+  if (server_fd < 0)
     {
-      fprintf (stderr, "Could not create server.\n");
+      g_critical ("Could not create server.");
       exit (1);
     }
+  hc_server_add_watch (server_fd, new_client, &pop_address);
 
-  g_message ("Listening at %s:%d.", conf_address, port);
+  pop_log_init ();
 
-  daemon (0, 0);
+  g_message ("Listening at %s:%s.", conf_address, port);
+
+  if (!foreground)
+    daemon (0, 0);
+
+  g_free (conf_address);
+  g_free (port);
 
   g_main_loop_run (g_main_loop_new (g_main_context_default (), TRUE));
 
   gnutls_global_deinit ();
 
+  g_free (server_address);
+  g_free (server_port);
+
   return 0;
 
 }