Make server port configurable

[cascardo/rnetproxy.git] / jabber.c

diff --git a/jabber.c b/jabber.c
index 81dc849..61ed23c 100644 (file)
--- a/jabber.c
+++ b/jabber.c
@@ -20,9 +20,33 @@
 #include <gnet.h>
 #include <glib.h>
 #include <iksemel.h>
+#include <gsasl.h>
 #include "iksemel_extra.h"
 #include "jabber.h"
 
+jabber_data_t* jabber_data_new (gpointer hook, gpointer parser)
+{
+  jabber_data_t *data;
+  data = g_slice_new0 (jabber_data_t);
+  data->parser = iks_extra_stream_new (hook, parser);
+  gsasl_init (&(data->ctx));
+  return data;
+}
+
+void jabber_data_destroy (gpointer data)
+{
+  jabber_data_t *jdata = (jabber_data_t*) data;
+  if (jdata->parser)
+    iks_parser_delete (jdata->parser);
+  if (jdata->client)
+    gsasl_finish (jdata->client);
+  if (jdata->server)
+    gsasl_finish (jdata->server);
+  if (jdata->ctx)
+    gsasl_done (jdata->ctx);
+  g_slice_free (jabber_data_t, jdata);
+}
+
 static void jabber_connect (net_hook_t* hook)
 {
 }
@@ -35,7 +59,7 @@ static void jabber_close (net_hook_t* hook)
       gnet_conn_disconnect (hook->peer->conn);
     }
   gnet_conn_delete (hook->conn);
-  iks_parser_delete (hook->data);
+  jabber_data_destroy (hook->data);
   g_slice_free (net_hook_t, hook);
 }
 
@@ -45,7 +69,8 @@ static void jabber_write (net_hook_t* hook)
 
 static void jabber_read (net_hook_t* hook, gchar* buffer, size_t len)
 {
-  iks_parse (hook->data, buffer, len, FALSE);
+  jabber_data_t *jdata = (jabber_data_t*) hook->data;
+  iks_parse (jdata->parser, buffer, len, FALSE);
 }
 
 void jabber_error (net_hook_t* hook)
@@ -146,7 +171,7 @@ net_hook_t* jabber_hook_new (GConn* conn)
   hook->close = jabber_close;
   hook->write = jabber_write;
   hook->read = jabber_read;
-  hook->data = iks_extra_stream_new (hook, jabber_parser);
+  hook->data = jabber_data_new (hook, jabber_parser);
   gnet_conn_set_callback (hook->conn, nethook_event, hook);
   return hook;
 }