Created XMPP context and better features parser

[cascardo/chat.git] / tictactoe.c

diff --git a/tictactoe.c b/tictactoe.c
index 19b4891..0049385 100644 (file)
--- a/tictactoe.c
+++ b/tictactoe.c
@@ -25,51 +25,18 @@
 #include <string.h>
 #include "tcp_connect.h"
 #include "iksemel_extra.h"
-
-void
-plain (void *data)
-{
-  iks *mplain;
-  char *str;
-  mplain = iks_new ("auth");
-  iks_insert_attrib (mplain, "xmlns", "urn:ietf:params:xml:ns:xmpp-sasl");
-  iks_insert_attrib (mplain, "mechanism", "PLAIN");
-  str = iks_string (iks_stack (mplain), mplain);
-  write ((int) data, str, strlen (str));
-  iks_delete (mplain);
-}
-
-void
-sasl (void *data, iks *s)
-{
-  iks *m;
-  for (m = iks_child (s); m != NULL; m = iks_next (m))
-    {
-      if (!iks_strcmp (iks_name (m), "mechanism") &&
-          !iks_strcmp (iks_cdata (iks_child (m)), "PLAIN"))
-        plain (data);
-    }
-}
-
-void
-features (void *data, iks *s)
-{
-  iks *f;
-  for (f = iks_child (s); f != NULL; f = iks_next (f))
-    {
-      if (!iks_strcmp (iks_name (f), "mechanisms") &&
-          !iks_strcmp (iks_find_attrib (f, "xmlns"),
-                       "urn:ietf:params:xml:ns:xmpp-sasl"))
-        sasl (data, f);
-    }
-}
+#include "xmpp.h"
 
 int
 myhook (void *data, int type, iks *stanza)
 {
   if (!iks_strcmp (iks_name (stanza), "stream:features"))
     {
-      features (data, stanza);
+      hc_xmpp_features (data, stanza);
+      if (hc_xmpp_is_tls_supported (data))
+        fprintf (stderr, "TLS is supported\n");
+      if (hc_xmpp_is_sasl_supported (data))
+        fprintf (stderr, "SASL is supported\n");
     }
   else
     {
@@ -104,9 +71,11 @@ main (int argc, char **argv)
   char *server = "jabber-br.org";
   int fd;
   iksparser *parser;
+  hc_xmpp_t *xmpp;
   dns_init (NULL, 1);
+  xmpp = hc_xmpp_new ();
   fd = hc_tcp_connect (server, "xmpp-client");
-  parser = iks_extra_stream_new ((void *) fd, myhook);
+  parser = iks_extra_stream_new (xmpp, myhook);
   write_stream (fd, server);
   loop (parser, fd);
   return 0;