stropheruby 0.2 → 0.2.1

data/ext/event.c

@@ -1,7 +1,7 @@
 /* event.c
 ** strophe XMPP client library -- event loop and management
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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,7 +49,6 @@
 
 #include "strophe.h"
 #include "common.h"
-#include "parser.h"
 
 #ifndef DEFAULT_TIMEOUT
 /** @def DEFAULT_TIMEOUT
@@ -84,7 +83,6 @@ 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;
@@ -130,16 +128,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;
 		}
 	    }
 
@@ -170,7 +168,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)
-	    conn_parser_reset(connitem->conn);
+	    parser_reset(connitem->conn);
     }
 
 
@@ -179,7 +177,7 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
        to be called */
     next = handler_fire_timed(ctx);
 
-    usec = ((next < timeout) ? next : timeout) * 1000;
+    long usec = ((next < timeout) ? next : timeout) * 1000;
     tv.tv_sec = usec / 1000000;
     tv.tv_usec = usec % 1000000;
 
@@ -225,15 +223,19 @@ 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());
+	if (!sock_is_recoverable(sock_error())) {
+	xmpp_error(ctx, "xmpp", "event watcher internal error %d", 
+                   sock_error());
+  conn->error = sock_error();
 	return -1;
     }
+    }
     
     /* no events happened */
-    if (ret == 0) return 1;
-    
+    if (ret == 0) {
+	return 1;
+    }
+
     /* process events */
     connitem = ctx->connlist;
     while (connitem) {
@@ -245,7 +247,8 @@ int xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long timeout)
 		/* connection complete */
 
 		/* check for error */
-		if (sock_connect_error(conn->sock) != 0) {
+		conn->error =  sock_connect_error(conn->sock); 
+		if (conn->error != 0) {
 		    /* connection failed */
 		    xmpp_debug(ctx, "xmpp", "connection failed");
 		    conn_disconnect(conn);
@@ -266,15 +269,16 @@ 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 = parser_feed(conn->parser, buf, ret);
+		    ret = XML_Parse(conn->parser, buf, ret, 0);
 		    if (!ret) {
 			/* parse error, we need to shut down */
 			/* FIXME */
 			xmpp_debug(ctx, "xmpp", "parse error, disconnecting");
+                        conn -> error = -1;
 			conn_disconnect(conn);
 		    }
 		} else {
@@ -286,13 +290,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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -66,7 +66,6 @@ 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;
 	    }
@@ -90,7 +89,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;
 	}
@@ -112,9 +111,6 @@ 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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.

data/ext/md5.c

@@ -47,7 +47,7 @@
  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
  * initialization constants.
  */
-void MD5Init(struct MD5Context *ctx)
+void sasl_MD5Init(struct MD5Context *ctx)
 {
     ctx->buf[0] = 0x67452301;
     ctx->buf[1] = 0xefcdab89;
@@ -64,7 +64,7 @@ void MD5Init(struct MD5Context *ctx)
  * Update context to reflect the concatenation of another buffer full
  * of bytes.
  */
-void MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
+void sasl_MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
 {
     uint32_t t;
 
@@ -110,7 +110,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, uint32_t len)
  * Final wrapup - pad to 64-byte boundary with the bit pattern 
  * 1 0* (64-bit count of bits processed, MSB-first)
  */
-void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
+void sasl_MD5Final(unsigned char digest[16], struct MD5Context *ctx)
 {
     unsigned count;
     unsigned char *p;
@@ -272,7 +272,7 @@ void MD5Transform(uint32_t buf[4], const unsigned char inext[64],
 
 #include <stdio.h>
 
-void MD5DumpBytes(unsigned char *b, int len)
+void sasl_MD5DumpBytes(unsigned char *b, int len)
 {
 	int i;
 	for (i=0; i<len; i++) {

data/ext/md5.h

@@ -6,7 +6,7 @@
 
 /** @file
  *  MD5 hash API.
- */
+*/
 
 #ifndef MD5_H
 #define MD5_H
@@ -27,15 +27,22 @@ struct MD5Context {
 	unsigned char in[64];
 };
 
-void MD5Init(struct MD5Context *context);
-void MD5Update(struct MD5Context *context, unsigned char const *buf,
+#ifdef __LIBSTROPHE_STROPHE_H__
+#define MD5Init sasl_MD5Init
+#define MD5Update sasl_MD5Update
+#define MD5Final sasl_MD5Final
+#define MD5DumpBytes sasl_MD5DumpBytes
+#endif
+
+void sasl_MD5Init(struct MD5Context *context);
+void sasl_MD5Update(struct MD5Context *context, unsigned char const *buf,
 	       uint32_t len);
-void MD5Final(unsigned char digest[16], struct MD5Context *context);
+void sasl_MD5Final(unsigned char digest[16], struct MD5Context *context);
 void MD5Transform(uint32_t buf[4], const unsigned char in[64],
 			struct MD5Context *ctx);
 
 #ifdef DEBUG_MD5
-void MD5DumpBytes(unsigned char *b, int len);
+void sasl_MD5DumpBytes(unsigned char *b, int len);
 #endif
 
 #endif /* !MD5_H */

data/ext/ostypes.h

@@ -2,7 +2,7 @@
 ** strophe XMPP client library -- type definitions for platforms 
 **     without stdint.h
 **
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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.c

@@ -0,0 +1,208 @@
+/* parser.c
+** strophe XMPP client library -- xml parser handlers and utility functions
+**
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+**
+**  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"
+
+static void _log_open_tag(xmpp_conn_t * const conn,
+			  const XML_Char **attr)
+{
+    char buf[4096];
+    size_t len, pos;
+    int i;
+
+    pos = 0;
+    len = xmpp_snprintf(buf, 4096, "<stream:stream");
+    if (len < 0) return;
+
+    pos += len;
+
+    for (i = 0; attr[i]; i += 2) {
+	len = xmpp_snprintf(&buf[pos], 4096 - pos, " %s=\"%s\"", 
+			    attr[i], attr[i+1]);
+	if (len < 0) return;
+
+	pos += len;
+    }
+
+    len = xmpp_snprintf(&buf[pos], 4096 - pos, ">");
+    if (len < 0) return;
+
+    xmpp_debug(conn->ctx, "xmpp", "RECV: %s", buf);
+}
+
+void parser_handle_start(void *userdata,
+			 const XML_Char *name,
+			 const XML_Char **attr)
+{
+    xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
+    xmpp_stanza_t *child;
+
+    if (conn->depth == 0) {
+	/* we're expecting a stream:stream tag. */
+	if (strcmp(name, "stream:stream") != 0) {
+	    xmpp_error(conn->ctx, "xmpp",
+		       "Server did not open valid stream.");
+	    conn->error = -3;
+	    conn_disconnect(conn);
+	} else {
+	    _log_open_tag(conn, attr);
+
+	    if (conn->stream_id) xmpp_free(conn->ctx, conn->stream_id);
+	    conn->stream_id = xmpp_strdup(conn->ctx, "foo");
+	    if (!conn->stream_id) {
+		xmpp_error(conn->ctx, "xmpp",
+			   "Memory allocation failure.");
+		conn->error = -2;
+		conn_disconnect(conn);
+	    }
+
+	    /* call stream open handler */
+	    conn->open_handler(conn);
+	}
+    } else {
+	/* build stanzas at depth 1 */
+	if (!conn->stanza && conn->depth != 1) {
+	    /* something terrible happened */
+	    /* FIXME: shutdown disconnect */
+	    xmpp_debug(conn->ctx, "xmpp", "oops, where did our stanza go?");
+	} else if (!conn->stanza) {
+	    /* starting a new toplevel stanza */
+	    conn->stanza = xmpp_stanza_new(conn->ctx);
+	    if (!conn->stanza) {
+		/* FIXME: can't allocate, disconnect */
+	    }
+	    xmpp_stanza_set_name(conn->stanza, name);
+	    xmpp_stanza_set_attributes(conn->stanza, attr);
+	} else {
+	    /* starting a child of conn->stanza */
+	    child = xmpp_stanza_new(conn->ctx);
+	    if (!child) {
+		/* FIXME: can't allocate, disconnect */
+	    }
+	    xmpp_stanza_set_name(child, name);
+	    xmpp_stanza_set_attributes(child, attr);
+
+	    /* add child to parent */
+	    xmpp_stanza_add_child(conn->stanza, child);
+	    
+	    /* the child is owned by the toplevel stanza now */
+	    xmpp_stanza_release(child);
+
+	    /* make child the current stanza */
+	    conn->stanza = child;
+	}
+    }
+
+    conn->depth++;
+}
+
+void parser_handle_end(void *userdata, const XML_Char *name)
+{
+    xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
+    char *buf;
+    size_t len;
+    xmpp_stanza_t *stanza;
+
+    conn->depth--;
+
+    if (conn->depth == 0) {
+	/* got a closing stream tag */
+	xmpp_debug(conn->ctx, "xmpp", "RECV: </stream:stream>");
+	conn_disconnect_clean(conn);
+    } else {
+	if (conn->stanza->parent) {
+	    /* we're finishing a child stanza, so set current to the parent */
+	    conn->stanza = conn->stanza->parent;
+	} else {
+	    /* we're finishing a toplevel stanza, so fire off handler */
+	    if (xmpp_stanza_to_text(conn->stanza, &buf, &len) == 0) {
+		xmpp_debug(conn->ctx, "xmpp", "RECV: %s", buf);
+		xmpp_free(conn->ctx, buf);
+	    }
+
+	    stanza = xmpp_stanza_clone(conn->stanza);
+	    xmpp_stanza_release(conn->stanza);
+	    conn->stanza = NULL;
+
+	    /* fire handlers */
+	    handler_fire_stanza(conn, stanza);
+
+	    xmpp_stanza_release(stanza);
+	}
+    }
+}
+
+void parser_handle_character(void *userdata, const XML_Char *s, int len)
+{
+    xmpp_conn_t *conn = (xmpp_conn_t *)userdata;
+    xmpp_stanza_t *stanza;
+
+    if (conn->depth < 2) return;
+
+    /* create and populate stanza */
+    stanza = xmpp_stanza_new(conn->ctx);
+    if (!stanza) {
+	/* FIXME: allocation error, disconnect */
+	return;
+    }
+    xmpp_stanza_set_text_with_size(stanza, s, len);
+
+    xmpp_stanza_add_child(conn->stanza, stanza);
+    xmpp_stanza_release(stanza);
+}
+
+/* prepares a parser reset.  this is called from handlers.  we can't
+ * reset the parser immediately as it is not reentrant. */
+void parser_prepare_reset(xmpp_conn_t * const conn, 
+			  xmpp_open_handler handler)
+{
+    conn->reset_parser = 1;
+    conn->open_handler = handler;
+}
+
+/* shuts down and restarts XML parser.  true on success */
+int parser_reset(xmpp_conn_t * const conn)
+{
+    conn->reset_parser = 0;
+
+    if (conn->parser)
+	XML_ParserFree(conn->parser);
+
+    if (conn->stanza) 
+	xmpp_stanza_release(conn->stanza);
+
+    conn->parser = XML_ParserCreate(NULL);
+    if (!conn->parser) return 0;
+
+    conn->depth = 0;
+    conn->stanza = NULL;
+    XML_SetUserData(conn->parser, conn);
+    XML_SetElementHandler(conn->parser, parser_handle_start, 
+			  parser_handle_end);
+    XML_SetCharacterDataHandler(conn->parser, parser_handle_character);
+
+    return 1;
+}
+

data/ext/sasl.h

@@ -1,7 +1,7 @@
 /* sasl.h
 ** strophe XMPP client library -- SASL authentication helpers
 ** 
-** Copyright (C) 2005-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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-2009 Collecta, Inc. 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  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,6 +400,45 @@ 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