stropheruby 0.1.5 → 0.2

data/ext/event.c

@@ -1,7 +1,7 @@
 /* event.c
 ** strophe XMPP client library -- event loop and management
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -31,7 +31,7 @@
  *  example, a GUI program will already include an event loop to
  *  process UI events from users, and xmpp_run_once() would be called
  *  from an idle function.
-*/
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -49,6 +49,7 @@
 
 #include "strophe.h"
 #include "common.h"
+#include "parser.h"
 
 #ifndef DEFAULT_TIMEOUT
 /** @def DEFAULT_TIMEOUT
@@ -83,6 +84,7 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     int towrite;
     char buf[4096];
     uint64_t next;
+    long usec;
 
     if (ctx->loop_status == XMPP_LOOP_QUIT) return -2;
     ctx->loop_status = XMPP_LOOP_RUNNING;
@@ -128,16 +130,16 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 		}
 
 	    } else {
-	    ret = sock_write(conn->sock, &sq->data[sq->written], towrite);
+		ret = sock_write(conn->sock, &sq->data[sq->written], towrite);
 
-	    if (ret < 0 && !sock_is_recoverable(sock_error())) {
-		/* an error occured */
-		conn->error = sock_error();
-		break;
-	    } else if (ret < towrite) {
-		/* not all data could be sent now */
-	        if (ret >= 0) sq->written += ret;
-		break;
+		if (ret < 0 && !sock_is_recoverable(sock_error())) {
+		    /* an error occured */
+		    conn->error = sock_error();
+		    break;
+		} else if (ret < towrite) {
+		    /* not all data could be sent now */
+		    if (ret >= 0) sq->written += ret;
+		    break;
 		}
 	    }
 
@@ -168,7 +170,7 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
     /* reset parsers if needed */
     for (connitem = ctx->connlist; connitem; connitem = connitem->next) {
 	if (connitem->conn->reset_parser)
-	    parser_reset(connitem->conn);
+	    conn_parser_reset(connitem->conn);
     }
 
 
@@ -177,7 +179,7 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
        to be called */
     next = handler_fire_timed(ctx);
 
-    long usec = ((next < timeout) ? next : timeout) * 1000;
+    usec = ((next < timeout) ? next : timeout) * 1000;
     tv.tv_sec = usec / 1000000;
     tv.tv_usec = usec % 1000000;
 
@@ -223,19 +225,15 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 
     /* select errored */
     if (ret < 0) {
-	if (!sock_is_recoverable(sock_error())) {
-	xmpp_error(ctx, "xmpp", "event watcher internal error %d", 
-                   sock_error());
-  conn->error = sock_error();
+	if (!sock_is_recoverable(sock_error()))
+	    xmpp_error(ctx, "xmpp", "event watcher internal error %d", 
+		       sock_error());
 	return -1;
     }
-    }
     
     /* no events happened */
-    if (ret == 0) {
-	return 1;
-    }
-
+    if (ret == 0) return 1;
+    
     /* process events */
     connitem = ctx->connlist;
     while (connitem) {
@@ -247,8 +245,7 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 		/* connection complete */
 
 		/* check for error */
-		conn->error =  sock_connect_error(conn->sock); 
-		if (conn->error != 0) {
+		if (sock_connect_error(conn->sock) != 0) {
 		    /* connection failed */
 		    xmpp_debug(ctx, "xmpp", "connection failed");
 		    conn_disconnect(conn);
@@ -269,16 +266,15 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 		if (conn->tls) {
 		    ret = tls_read(conn->tls, buf, 4096);
 		} else {
-		ret = sock_read(conn->sock, buf, 4096);
+		    ret = sock_read(conn->sock, buf, 4096);
 		}
 
 		if (ret > 0) {
-		    ret = XML_Parse(conn->parser, buf, ret, 0);
+		    ret = parser_feed(conn->parser, buf, ret);
 		    if (!ret) {
 			/* parse error, we need to shut down */
 			/* FIXME */
 			xmpp_debug(ctx, "xmpp", "parse error, disconnecting");
-                        conn -> error = -1;
 			conn_disconnect(conn);
 		    }
 		} else {
@@ -290,13 +286,13 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 			    conn_disconnect(conn);
 			}
 		    } else {
-		    /* return of 0 means socket closed by server */
-		    xmpp_debug(ctx, "xmpp", "Socket closed by remote host.");
-		    conn->error = ECONNRESET;
-		    conn_disconnect(conn);
+			/* return of 0 means socket closed by server */
+			xmpp_debug(ctx, "xmpp", "Socket closed by remote host.");
+			conn->error = ECONNRESET;
+			conn_disconnect(conn);
+		    }
 		}
 	    }
-	    }
 
 	    break;
 	case XMPP_STATE_DISCONNECTED:

data/ext/handler.c

@@ -1,7 +1,7 @@
 /* handler.c
 ** strophe XMPP client library -- event handler management
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -66,6 +66,7 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
 		    hash_drop(conn->id_handlers, id);
 		    hash_add(conn->id_handlers, id, next);
 		}
+                xmpp_free(conn->ctx, item->id);
 		xmpp_free(conn->ctx, item);
 		item = NULL;
 	    }
@@ -89,7 +90,7 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
     while (item) {
 	/* skip newly added handlers */
 	if (!item->enabled) {
-        prev = item;
+	    prev = item;
 	    item = item->next;
 	    continue;
 	}
@@ -111,6 +112,9 @@ void handler_fire_stanza(xmpp_conn_t * const conn,
 		    prev->next = item->next;
 		else
 		    conn->handlers = item->next;
+                if (item->ns) xmpp_free(conn->ctx, item->ns);
+                if (item->name) xmpp_free(conn->ctx, item->name);
+                if (item->type) xmpp_free(conn->ctx, item->type);
 		xmpp_free(conn->ctx, item);
 		item = NULL;
 	    }

data/ext/hash.c

@@ -1,7 +1,7 @@
 /* hash.c
 ** strophe XMPP client library -- hash table implementation
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Hash tables.
-*/
+ */
 
 #include <stdlib.h>
 #include <string.h>

data/ext/hash.h

@@ -1,7 +1,7 @@
 /* hash.h
 ** strophe XMPP client library -- hash table interface
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Hash table API.
-*/
+ */
 
 #ifndef __LIBSTROPHE_HASH_H__
 #define __LIBSTROPHE_HASH_H__

data/ext/jid.c

@@ -1,7 +1,7 @@
 /* jid.c
 ** strophe XMPP client library -- helper functions for parsing JIDs
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

data/ext/md5.h

@@ -6,7 +6,7 @@
 
 /** @file
  *  MD5 hash API.
-*/
+ */
 
 #ifndef MD5_H
 #define MD5_H

data/ext/ostypes.h

@@ -2,7 +2,7 @@
 ** strophe XMPP client library -- type definitions for platforms 
 **     without stdint.h
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -15,7 +15,7 @@
 
 /** @file
  *  Type definitions for platforms without stdint.h.
-*/
+ */
 
 #ifndef __LIBSTROPHE_OSTYPES_H__
 #define __LIBSTROPHE_OSTYPES_H__

data/ext/parser.h

@@ -0,0 +1,43 @@
+/* parser.h
+** strophe XMPP client library -- parser structures and functions
+**
+** Copyright (C) 2005-2009 Collecta, Inc. 
+**
+**  This software is provided AS-IS with no warranty, either express or
+**  implied.
+**
+**  This software is distributed under license and may not be copied,
+**  modified or distributed except as expressly authorized under the
+**  terms of the license contained in the file LICENSE.txt in this
+**  distribution.
+*/
+
+/** @file
+ *  Internally used functions and structures.
+ */
+
+#ifndef __LIBSTROPHE_PARSER_H__
+#define __LIBSTROPHE_PARSER_H__
+
+#include "strophe.h"
+
+typedef struct _parser_t parser_t;
+
+typedef void (*parser_start_callback)(char *name,
+                                      char **attrs,
+                                      void * const userdata);
+typedef void (*parser_end_callback)(char *name, void * const userdata);
+typedef void (*parser_stanza_callback)(xmpp_stanza_t *stanza,
+                                       void * const userdata);
+
+
+parser_t *parser_new(xmpp_ctx_t *ctx, 
+                     parser_start_callback startcb,
+                     parser_end_callback endcb,
+                     parser_stanza_callback stanzacb,
+                     void *userdata);
+void parser_free(parser_t * const parser);
+int parser_reset(parser_t *parser);
+int parser_feed(parser_t *parser, char *chunk, int len);
+
+#endif /* __LIBSTROPHE_PARSER_H__ */

data/ext/parser_expat.c

@@ -0,0 +1,202 @@
+/* parser.c
+** strophe XMPP client library -- xml parser handlers and utility functions
+**
+** Copyright (C) 2005-2009 Collecta, Inc. 
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This software is distributed under license and may not be copied,
+**  modified or distributed except as expressly authorized under the
+**  terms of the license contained in the file LICENSE.txt in this
+**  distribution.
+*/
+
+/** @file
+ *  XML parser handlers.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <expat.h>
+
+#include <strophe.h>
+#include "common.h"
+#include "parser.h"
+
+struct _parser_t {
+    xmpp_ctx_t *ctx;
+    XML_Parser expat;
+    parser_start_callback startcb;
+    parser_end_callback endcb;
+    parser_stanza_callback stanzacb;
+    void *userdata;
+    int depth;
+    xmpp_stanza_t *stanza;
+};
+
+static void _set_attributes(xmpp_stanza_t *stanza, const XML_Char **attrs)
+{
+    int i;
+
+    if (!attrs) return;
+
+    for (i = 0; attrs[i]; i += 2) {
+        xmpp_stanza_set_attribute(stanza, attrs[i], attrs[i+1]);
+    }
+}
+
+static void _start_element(void *userdata,
+                           const XML_Char *name,
+                           const XML_Char **attrs)
+{
+    parser_t *parser = (parser_t *)userdata;
+    xmpp_stanza_t *child;
+
+    if (parser->depth == 0) {
+        /* notify the owner */
+        if (parser->startcb)
+            parser->startcb((char *)name, (char **)attrs, 
+                            parser->userdata);
+    } else {
+	/* build stanzas at depth 1 */
+	if (!parser->stanza && parser->depth != 1) {
+	    /* something terrible happened */
+	    /* FIXME: shutdown disconnect */
+	    xmpp_error(parser->ctx, "parser", "oops, where did our stanza go?");
+	} else if (!parser->stanza) {
+	    /* starting a new toplevel stanza */
+	    parser->stanza = xmpp_stanza_new(parser->ctx);
+	    if (!parser->stanza) {
+		/* FIXME: can't allocate, disconnect */
+	    }
+	    xmpp_stanza_set_name(parser->stanza, name);
+	    _set_attributes(parser->stanza, attrs);
+	} else {
+	    /* starting a child of parser->stanza */
+	    child = xmpp_stanza_new(parser->ctx);
+	    if (!child) {
+		/* FIXME: can't allocate, disconnect */
+	    }
+	    xmpp_stanza_set_name(child, name);
+	    _set_attributes(child, attrs);
+
+	    /* add child to parent */
+	    xmpp_stanza_add_child(parser->stanza, child);
+	    
+	    /* the child is owned by the toplevel stanza now */
+	    xmpp_stanza_release(child);
+
+	    /* make child the current stanza */
+	    parser->stanza = child;
+	}
+    }
+
+    parser->depth++;
+}
+
+static void _end_element(void *userdata, const XML_Char *name)
+{
+    parser_t *parser = (parser_t *)userdata;
+
+    parser->depth--;
+
+    if (parser->depth == 0) {
+        /* notify the owner */
+        if (parser->endcb)
+            parser->endcb((char *)name, parser->userdata);
+    } else {
+	if (parser->stanza->parent) {
+	    /* we're finishing a child stanza, so set current to the parent */
+	    parser->stanza = parser->stanza->parent;
+	} else {
+            if (parser->stanzacb)
+                parser->stanzacb(parser->stanza,
+                                 parser->userdata);
+	    xmpp_stanza_release(parser->stanza);
+	    parser->stanza = NULL;
+	}
+    }
+}
+
+static void _characters(void *userdata, const XML_Char *s, int len)
+{
+    parser_t *parser = (parser_t *)userdata;
+    xmpp_stanza_t *stanza;
+
+    if (parser->depth < 2) return;
+
+    /* create and populate stanza */
+    stanza = xmpp_stanza_new(parser->ctx);
+    if (!stanza) {
+	/* FIXME: allocation error, disconnect */
+	return;
+    }
+    xmpp_stanza_set_text_with_size(stanza, s, len);
+
+    xmpp_stanza_add_child(parser->stanza, stanza);
+    xmpp_stanza_release(stanza);
+}
+
+parser_t *parser_new(xmpp_ctx_t *ctx,
+                     parser_start_callback startcb,
+                     parser_end_callback endcb,
+                     parser_stanza_callback stanzacb,
+                     void *userdata)
+{
+    parser_t *parser;
+
+    parser = xmpp_alloc(ctx, sizeof(parser_t));
+    if (parser != NULL) {
+        parser->ctx = ctx;
+        parser->expat = NULL;
+        parser->startcb = startcb;
+        parser->endcb = endcb;
+        parser->stanzacb = stanzacb;
+        parser->userdata = userdata;
+        parser->depth = 0;
+        parser->stanza = NULL;
+
+        parser_reset(parser);
+    }
+
+    return parser;
+}
+
+/* free a parser */
+void parser_free(parser_t *parser)
+{
+    if (parser->expat)
+        XML_ParserFree(parser->expat);
+
+    xmpp_free(parser->ctx, parser);
+}
+
+/* shuts down and restarts XML parser.  true on success */
+int parser_reset(parser_t *parser)
+{
+    if (parser->expat)
+	XML_ParserFree(parser->expat);
+
+    if (parser->stanza) 
+	xmpp_stanza_release(parser->stanza);
+
+    parser->expat = XML_ParserCreate(NULL);
+    if (!parser->expat) return 0;
+
+    parser->depth = 0;
+    parser->stanza = NULL;
+
+    XML_SetUserData(parser->expat, parser);
+    XML_SetElementHandler(parser->expat, _start_element, _end_element);
+    XML_SetCharacterDataHandler(parser->expat, _characters);
+
+    return 1;
+}
+
+int parser_feed(parser_t *parser, char *chunk, int len)
+{
+    return XML_Parse(parser->expat, chunk, len, 0);
+}

data/ext/sasl.h

@@ -1,7 +1,7 @@
 /* sasl.h
 ** strophe XMPP client library -- SASL authentication helpers
 ** 
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  * SASL authentication helpers.
-*/
+ */
 
 #ifndef __LIBSTROPHE_SASL_H__
 #define __LIBSTROPHE_SASL_H__
@@ -39,6 +39,6 @@ int base64_decoded_len(xmpp_ctx_t *ctx,
 		       const char * const buffer, const unsigned len);
 
 unsigned char *base64_decode(xmpp_ctx_t *ctx,
-			     const char * const buffer, const unsigned len);
+			     const char * const buffer, const unsigned  len);
 
 #endif /* _LIBXMPP_SASL_H__ */

data/ext/sock.c

@@ -1,7 +1,7 @@
 /* sock.c
 ** strophe XMPP client library -- socket abstraction implementation
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

data/ext/sock.h

@@ -1,7 +1,7 @@
 /* sock.h
 ** strophe XMPP client library -- socket abstraction header
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Socket abstraction API.
-*/
+ */
 
 #ifndef __LIBSTROPHE_SOCK_H__
 #define __LIBSTROPHE_SOCK_H__

data/ext/stanza.c

@@ -1,7 +1,7 @@
 /* stanza.c
 ** strophe XMPP client library -- XMPP stanza object and utilities
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -165,13 +165,13 @@ int xmpp_stanza_release(xmpp_stanza_t * const stanza)
     if (stanza->ref > 1)
 	stanza->ref--;
     else {
-    /* release all children */
-    child = stanza->children;
-    while (child) {
-	tchild = child;
-	child = child->next;
-	xmpp_stanza_release(tchild);
-    }
+	/* release all children */
+	child = stanza->children;
+	while (child) {
+	    tchild = child;
+	    child = child->next;
+	    xmpp_stanza_release(tchild);
+	}
 
 	if (stanza->attributes) hash_release(stanza->attributes);
 	if (stanza->data) xmpp_free(stanza->ctx, stanza->data);
@@ -400,45 +400,6 @@ char *xmpp_stanza_get_name(xmpp_stanza_t * const stanza)
     return stanza->data;
 }
 
-/** Set or replace attributes on a stanza.
- *  This function replaces all previous attributes (if any) with the
- *  attributes given.  It is used primarily by the XML parser during
- *  stanza creation.  All strings in the array are copied before placing them
- *  inside the stanza object.
- *
- *  @param stanza a Strophe stanza object
- *  @param attr an array of strings with the attributes in the following
- *      format: attr[i] = attribute name, attr[i+1] = attribute value
- *
- *  @return XMPP_EOK on success, a number less than 0 on failure (XMPP_EMEM,
- *      XMPP_EINVOP)
- *
- *  @ingroup Stanza
- */
-int xmpp_stanza_set_attributes(xmpp_stanza_t * const stanza,
-			       const char * const * const attr)
-{
-    int i;
-    char *value;
-
-    if (stanza->attributes != NULL)
-	hash_release(stanza->attributes);
-
-    stanza->attributes = hash_new(stanza->ctx, 8, xmpp_free);
-    if (!stanza->attributes) return XMPP_EMEM;
-    
-    for (i = 0; attr[i]; i += 2) {
-	value = xmpp_strdup(stanza->ctx, attr[i + 1]);
-	if (!value) {
-	    /* FIXME: memory allocation error */
-	    continue;
-	}
-	hash_add(stanza->attributes, attr[i], value);
-    }
-    
-    return XMPP_EOK;
-}
-
 /** Count the attributes in a stanza object.
  *
  *  @param stanza a Strophe stanza object

data/ext/strophe.h

@@ -1,7 +1,7 @@
 /* strophe.h
 ** strophe XMPP client library C API
 **
-** Copyright (C) 2005-2008 OGG, LLC.
+** Copyright (C) 2005-2009 Collecta, Inc.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Strophe public C API definitions.
-*/
+ */
 
 #ifndef __LIBSTROPHE_STROPHE_H__
 #define __LIBSTROPHE_STROPHE_H__
@@ -212,16 +212,19 @@ xmpp_conn_t * xmpp_conn_clone(xmpp_conn_t * const conn);
 int xmpp_conn_release(xmpp_conn_t * const conn);
 
 const char *xmpp_conn_get_jid(const xmpp_conn_t * const conn);
+const char *xmpp_conn_get_bound_jid(const xmpp_conn_t * const conn);
 void xmpp_conn_set_jid(xmpp_conn_t * const conn, const char * const jid);
 const char *xmpp_conn_get_pass(const xmpp_conn_t * const conn);
 void xmpp_conn_set_pass(xmpp_conn_t * const conn, const char * const pass);
+unsigned int xmpp_conn_get_connect_timeout(const xmpp_conn_t * const conn);
+void xmpp_conn_set_connect_timeout(xmpp_conn_t * const conn, const unsigned int timeout);     
 xmpp_ctx_t* xmpp_conn_get_context(xmpp_conn_t * const conn);
 
-int xmpp_connect_client(xmpp_conn_t * const conn,
+int xmpp_connect_client(xmpp_conn_t * const conn, 
 			  const char * const altdomain,
 			  unsigned short altport,
-			xmpp_conn_handler callback,
-			void * const userdata);
+			  xmpp_conn_handler callback,
+			  void * const userdata);
 
 /*
 int xmpp_connect_component(conn, name)

data/ext/thread.c

@@ -1,7 +1,7 @@
 /* thread.c
 ** strophe XMPP client library -- thread abstraction
 **
-** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2009 Collecta, Inc. 
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -14,7 +14,7 @@
 
 /** @file
  *  Thread absraction.
-*/
+ */
 
 #include <stdio.h>
 #include <stdlib.h>