Mercurial > pidgin.yaz

changeset 16746:52357f6392a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add partial implementation of MsimMessage (not used anywhere yet).
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Tue, 22 May 2007 06:03:18 +0000
parents 3f53f8f502b2
children 496855295bd7
files libpurple/protocols/myspace/Makefile.am libpurple/protocols/myspace/Makefile.mingw libpurple/protocols/myspace/myspace.c libpurple/protocols/myspace/myspace.h
diffstat 4 files changed, 61 insertions(+), 121 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/myspace/Makefile.am	Sun May 20 20:56:04 2007 +0000
+++ b/libpurple/protocols/myspace/Makefile.am	Tue May 22 06:03:18 2007 +0000
@@ -2,7 +2,7 @@
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-SOURCES = myspace.c
+SOURCES = myspace.c message.c
 
 AM_CFLAGS = $(st)
 
--- a/libpurple/protocols/myspace/Makefile.mingw	Sun May 20 20:56:04 2007 +0000
+++ b/libpurple/protocols/myspace/Makefile.mingw	Tue May 22 06:03:18 2007 +0000
@@ -1,13 +1,13 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of libirc
+# Description: Makefile for win32 (mingw) version of libmyspace
 #
 
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
 
-TARGET = libirc
+TARGET = libmyspace
 TYPE = PLUGIN
 
 # Static or Plugin...
@@ -37,11 +37,7 @@
 ##
 ##  SOURCES, OBJECTS
 ##
-C_SRC =			cmds.c \
-			dcc_send.c \
-			irc.c \
-			msgs.c \
-			parse.c
+C_SRC =			myspace.c message.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
--- a/libpurple/protocols/myspace/myspace.c	Sun May 20 20:56:04 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Tue May 22 06:03:18 2007 +0000
@@ -58,6 +58,7 @@
 #include "debug.h"      /* for purple_debug_info */
 
 #include "myspace.h"
+#include "message.h"
 
 /** 
  * Load the plugin.
@@ -143,12 +144,7 @@
 /**
  * Unescape a protocol message.
  *
- * @param msg The message to unescape.
- *
  * @return The unescaped message. Caller must g_free().
- *
- * Messages should be unescaped after being received, as part of
- * the parsing process.
  */
 static gchar *msim_unescape(const gchar *msg)
 {
@@ -164,11 +160,7 @@
 /**
  * Escape a protocol message.
  *
- * @param msg The message to escape.
- *
  * @return The escaped message. Caller must g_free().
- *
- * Messages should be escaped before sending.
  */
 static gchar *msim_escape(const gchar *msg)
 {
@@ -208,6 +200,7 @@
 }
 
 
+
 /** 
  * Parse a MySpaceIM protocol message into a hash table. 
  *
@@ -405,91 +398,19 @@
 	return TRUE;
 }
 
-/**
- * Pack a key=value item into a part of a protocol messge.
+/** Send an existing MsimMessage.
  */
-static void msim_pack_each(gpointer key, gpointer value, gpointer user_data)
-{
-	gchar ***items;		/* wow, a pointer to a pointer to a pointer */
-	gchar *item;
-
-	items = user_data;
-
-	/* Not all values should be escaped! (base64'd binary, 'response' must not be). 
-	 * TODO: escape the values that should be, don't escape what shouldn't! */
-#if 0
-	gchar *escaped_key, *escaped_value;
-	escaped_key = msim_escape((gchar *)key);
-	escaped_value = msim_escape((gchar *)value);
-
-	item = g_strdup_printf("%s\\%s", escaped_key, escaped_value);
-	
-	g_free(escaped_key);
-	g_free(escaped_value);
-#else
-
-	item = g_strdup_printf("%s\\%s", (gchar *)key, (gchar *)value);
-#endif
-
-	**items = item;
-	++(*items);
-}
-
-/**
- * Pack a hash table of a protocol of a message into a string suitable
- * for sending.
- *
- * @return The packed string; caller must g_free() when no longer needed.
- */
-static gchar *msim_pack(GHashTable *table)
-{
-	gchar **items, **items_tmp;
-	gchar *raw;
-	guint i;
 
-	/* Create an array with enough elements for each part of the
-	 * protocol message - one for each item, plus one for the initial \\,
-	 * another for the ending \\final\\, and the last for NULL terminator.
-	 */
-	items = (gchar **)g_new0(gchar *, g_hash_table_size(table) + 3);
-
-	/* Beginning and ending markers. */
-	items[0] = g_strdup("");	
-	items[g_hash_table_size(table) + 1] = g_strdup("final");
-	items[g_hash_table_size(table) + 2] = g_strdup("");
-
-	items_tmp = items + 1;
-	g_hash_table_foreach(table, (GHFunc)msim_pack_each, &items_tmp);
-
-	/* Join each item of the message. */
-	raw = g_strjoinv("\\", items);
-
-	/* Free each item, then the array itself. */
-	for (i = 0; i < g_hash_table_size(table); ++i)
-	{
-		g_free(items[i]);
-	}
-	g_free(items);
-
-	return raw;
-}
-
-/**
- * Send a message to the server, by a hash table.
- *
- * @param session
- * @param table A hash table of the message to send.
- */
-static gboolean msim_sendh(MsimSession *session, GHashTable *table)
+/* TODO: move to message.c */
+static gboolean msim_msg_send(MsimSession *session, MsimMessage *msg)
 {
-	gchar *raw_msg;
+	gchar *raw;
 	gboolean success;
-
-	raw_msg = msim_pack(table);
-	success = msim_send_raw(session, raw_msg);
-
-	g_free(raw_msg);
-
+	
+	raw = msim_msg_pack(msg);
+	success = msim_send_raw(session, raw);
+	g_free(raw);
+	
 	return success;
 }
 
@@ -499,7 +420,7 @@
  * variable arguments.
  *
  * @param session
- * @param ... A sequence of gchar* key/value pairs, terminated with NULL. The strings will be copied.
+ * @param ... A sequence of gchar* key/value pairs, terminated with NULL. 
  *
  * IMPORTANT: The key/value pair strings are not copied. The 'key' strings 
  * are not freed, but the 'value' pair is. Use g_strdup() to pass a static
@@ -510,20 +431,19 @@
  * It bears repeating: THE VALUE STRINGS WILL BE FREED. Copy if static.
  *
  * This function exists for coding convenience: a message can be created
- * and sent in one line of code. Internally it calls msim_sendh().
+ * and sent in one line of code. Internally it calls msim_msg_send().
  *
- * TODO: types
  */
 
 static gboolean msim_send(MsimSession *session, ...)
 {
 	va_list argp;
-	GHashTable *table;
 	gchar *key, *value;
+	MsimMessageType type;
 	gboolean success;
+	MsimMessage *msg;
     
-	table = g_hash_table_new_full((GHashFunc)g_str_hash, 
-            (GEqualFunc)g_str_equal, NULL, g_free);
+	msg = msim_msg_new();
 
 	/* Parse key, value pairs until NULL. */
 	va_start(argp, session);
@@ -535,22 +455,34 @@
 			break;
 		}
 
-		value = va_arg(argp, gchar *);
-		if (!value)
+		type = va_arg(argp, int);
+
+		switch (type)
 		{
-			purple_debug_info("msim", "msim_send: no value for key '%s', ignoring\n", key);
-			break;
+			case MSIM_TYPE_INTEGER: 
+				msim_msg_append(msg, key, type, GUINT_TO_POINTER(va_arg(argp, int)));
+				break;
+				
+			case MSIM_TYPE_STRING:
+				value = va_arg(argp, char *);
+
+				g_return_val_if_fail(value != NULL, FALSE);
+
+				msim_msg_append(msg, key, type, value);
+				break;
+
+			default:
+				purple_debug_info("msim", "msim_send: unknown type %d\n", type);
+				break;
 		}
-
-		g_hash_table_insert(table, key, value);
 	} while(key && value);
 
 	/* Actually send the message. */
-	success = msim_sendh(session, table);
+	success = msim_msg_send(session, msg);
 
 	/* Cleanup. */
 	va_end(argp);	
-	g_hash_table_destroy(table);
+	msim_msg_free(msg);
 
 	return success;
 }
@@ -1964,9 +1896,23 @@
 	NULL 											  /**< reserved4      */
 };
 
+#include "message.h"
+
 static void init_plugin(PurplePlugin *plugin) 
 {
 	PurpleAccountOption *option;
+#ifdef _TEST_MSIM_MSG
+	MsimMessage *msg = msim_msg_new();
+	msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, "v1");
+	msg = msim_msg_append(msg, "k1", MSIM_TYPE_INTEGER, 42);
+	msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, "v43");
+	msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, "v5");
+	msg = msim_msg_append(msg, "k1", MSIM_TYPE_STRING, "v7");
+	purple_debug_info("msim", "msg=%s\n", msim_msg_pack(msg));
+	purple_debug_info("msim", "msg=%s\n", msim_msg_debug_string(msg));
+	msim_msg_free(msg);
+	exit(0);
+#endif
 
 	/* TODO: default to automatically try different ports. Make the user be
 	 * able to set the first port to try (like LastConnectedPort in Windows client).  */
--- a/libpurple/protocols/myspace/myspace.h	Sun May 20 20:56:04 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Tue May 22 06:03:18 2007 +0000
@@ -19,6 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifndef _MYSPACE_MYSPACE_H
+#define _MYSPACE_MYSPACE_H
+
 /* Conditional compilation options */
 
 /* Debugging options */
@@ -38,15 +41,6 @@
 
 /* Constants */
 
-/* Protocol field types */
-#define MSIM_TYPE_INTEGER		0
-#define MSIM_TYPE_STRING		1
-#define MSIM_TYPE_BINARY		2
-#define MSIM_TYPE_BOOLEAN		3
-#define MSIM_TYPE_DICTIONARY	4
-#define MSIM_TYPE_LIST			5
-
-
 /* Statuses */
 #define MSIM_STATUS_ONLINE      "online"
 #define MSIM_STATUS_AWAY        "away"
@@ -122,9 +116,11 @@
 static GList *msim_status_types(PurpleAccount *acct);
 static const gchar *msim_list_icon(PurpleAccount *acct, PurpleBuddy *buddy);
 
+/* TODO: move these three functions to message.c/h */
 static gchar *msim_unescape(const gchar *msg);
 static gchar *msim_escape(const gchar *msg);
 static gchar *str_replace(const gchar* str, const gchar *old, const gchar *new);
+
 static GHashTable *msim_parse(gchar* msg);
 static GHashTable* msim_parse_body(const gchar *body_str);
 
@@ -213,3 +209,5 @@
 
 void crypt_rc4(rc4_state_struct *rc4_state, unsigned char *data, int data_len);
 #endif	/* !MSIM_USE_PURPLE_RC4 */
+
+#endif /* !_MYSPACE_MYSPACE_H */