pidgin: src/protocols/msn/servconn.c comparison

comparison src/protocols/msn/servconn.c @ 5506:4f72b611f0ee

[gaim-migrate @ 5905] A few changes here. - Messages now have reference counting. - There's a message queue API in servconn. This was needed for times when we have a message but need further information from a command before processing it, like initial e-mail notifications. - As a result of the two above, we now have initial e-mail notifications again! committer: Tailor Script <tailor@pidgin.im>

author	Christian Hammond <chipx86@chipx86.com>
date	Sun, 25 May 2003 09:04:32 +0000
parents	c6efac0e28ff
children	46d7ad0dfa26

comparison

equal deleted inserted replaced

-:870207a49f2f
+:4f72b611f0ee
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include "msn.h"
 #include "servconn.h"
+typedef struct
+{
+	char *command;
+	MsnMessage *msg;
+} MsnQueueEntry;
 static gboolean
-__process_single_line(MsnServConn *servconn, char *str)
+__process_message(MsnServConn *servconn, MsnMessage *msg)
-{
-	MsnServConnCommandCb cb;
-	gboolean result;
-	size_t param_count = 0;
-	char *command, *param_start;
-	char **params = NULL;
-	command = str;
-	/**
-	 * See how many spaces we have in this.
-	 */
-	param_start = strchr(command, ' ');
-	if (param_start != NULL) {
-		params = g_strsplit(param_start + 1, " ", 0);
-		for (param_count = 0; params[param_count] != NULL; param_count++)
-			;
-		*param_start = '\0';
-	}
-	cb = g_hash_table_lookup(servconn->commands, command);
-	if (cb == NULL) {
-		cb = g_hash_table_lookup(servconn->commands, "_UNKNOWN_");
-		if (cb == NULL) {
-			gaim_debug(GAIM_DEBUG_WARNING, "msn",
-					   "Unhandled command '%s'\n", str);
-			if (params != NULL)
-				g_strfreev(params);
-			return TRUE;
-		}
-	}
-	result = cb(servconn, command, (const char **)params, param_count);
-	if (params != NULL)
-		g_strfreev(params);
-	return result;
-}
-static gboolean
-__process_multi_line(MsnServConn *servconn, char *buffer)
 {
 	MsnServConnMsgCb cb;
-	MsnMessage *msg;
-	char msg_str[MSN_BUF_LEN];
-	g_snprintf(msg_str, sizeof(msg_str),
-			   "MSG %s %s %d\r\n%s",
-			   servconn->msg_passport, servconn->msg_friendly,
-			   servconn->msg_len, buffer);
-	msg = msn_message_new_from_str(servconn->session, msg_str);
 	cb = g_hash_table_lookup(servconn->msg_types,
 							 msn_message_get_content_type(msg));
 	if (cb == NULL) {
 		gaim_debug(GAIM_DEBUG_WARNING, "msn",
 				   "Unhandled content-type '%s': %s\n",
 				   msn_message_get_content_type(msg),
 				   msn_message_get_body(msg));
-		msn_message_destroy(msg);
 		return FALSE;
 	}
+	cb(servconn, msg);
+	return TRUE;
+}
+static gboolean
+__process_single_line(MsnServConn *servconn, char *str)
+{
+	MsnServConnCommandCb cb;
+	GSList *l, *l_next;
+	gboolean result;
+	size_t param_count = 0;
+	char *command, *param_start;
+	char **params = NULL;
+	command = str;
+	/**
+	 * See how many spaces we have in this.
+	 */
+	param_start = strchr(command, ' ');
+	if (param_start != NULL) {
+		params = g_strsplit(param_start + 1, " ", 0);
+		for (param_count = 0; params[param_count] != NULL; param_count++)
+			;
+		*param_start = '\0';
+	}
+	cb = g_hash_table_lookup(servconn->commands, command);
+	if (cb == NULL) {
+		cb = g_hash_table_lookup(servconn->commands, "_UNKNOWN_");
+		if (cb == NULL) {
+			gaim_debug(GAIM_DEBUG_WARNING, "msn",
+					   "Unhandled command '%s'\n", str);
+			if (params != NULL)
+				g_strfreev(params);
+			return TRUE;
+		}
+	}
+	result = cb(servconn, command, (const char **)params, param_count);
+	if (params != NULL)
+		g_strfreev(params);
+	/* Process all queued messages that are waiting on this command. */
+	for (l = servconn->msg_queue; l != NULL; l = l_next) {
+		MsnQueueEntry *entry = l->data;
+		MsnMessage *msg;
+		l_next = l->next;
+		if (entry->command == NULL ||
+			!g_ascii_strcasecmp(entry->command, command)) {
+			MsnUser *sender;
+			msg = entry->msg;
+			msn_message_ref(msg);
+			msn_servconn_unqueue_message(servconn, entry->msg);
+			sender = msn_message_get_sender(msg);
+			servconn->msg_passport = g_strdup(msn_user_get_passport(sender));
+			servconn->msg_friendly = g_strdup(msn_user_get_name(sender));
+			__process_message(servconn, msg);
+			g_free(servconn->msg_passport);
+			g_free(servconn->msg_friendly);
+			msn_message_destroy(msg);
+		}
+	}
+	return result;
+}
+static gboolean
+__process_multi_line(MsnServConn *servconn, char *buffer)
+{
+	MsnMessage *msg;
+	char msg_str[MSN_BUF_LEN];
+	gboolean result;
+	g_snprintf(msg_str, sizeof(msg_str),
+			   "MSG %s %s %d\r\n%s",
+			   servconn->msg_passport, servconn->msg_friendly,
+			   servconn->msg_len, buffer);
 	gaim_debug(GAIM_DEBUG_MISC, "msn",
 			   "Message: {%s}\n", buffer);
-	cb(servconn, msg);
+	msg = msn_message_new_from_str(servconn->session, msg_str);
+	result = __process_message(servconn, msg);
 	msn_message_destroy(msg);
-	return TRUE;
+	return result;
 }
 static void
 __connect_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	if (servconn->inpa)
 		gaim_input_remove(servconn->inpa);
 	g_free(servconn->rxqueue);
-	while (servconn->txqueue) {
+	while (servconn->txqueue != NULL) {
 		g_free(servconn->txqueue->data);
 		servconn->txqueue = g_slist_remove(servconn->txqueue,
 										   servconn->txqueue->data);
+	}
+	while (servconn->msg_queue != NULL) {
+		MsnQueueEntry *entry = servconn->msg_queue->data;
+		msn_servconn_unqueue_message(servconn, entry->msg);
 	}
 	servconn->connected = FALSE;
 }
 	else
 		g_snprintf(buf, sizeof(buf), "%s %u %s\r\n",
 				   command, servconn->session->trId++, params);
 	return (msn_servconn_write(servconn, buf, strlen(buf)) > 0);
+}
+void
+msn_servconn_queue_message(MsnServConn *servconn, const char *command,
+						   MsnMessage *msg)
+{
+	MsnQueueEntry *entry;
+	g_return_if_fail(servconn != NULL);
+	g_return_if_fail(msg != NULL);
+	entry          = g_new0(MsnQueueEntry, 1);
+	entry->msg     = msg;
+	entry->command = (command == NULL ? NULL : g_strdup(command));
+	servconn->msg_queue = g_slist_append(servconn->msg_queue, entry);
+	msn_message_ref(msg);
+}
+void
+msn_servconn_unqueue_message(MsnServConn *servconn, MsnMessage *msg)
+{
+	MsnQueueEntry *entry = NULL;
+	GSList *l;
+	g_return_if_fail(servconn != NULL);
+	g_return_if_fail(msg != NULL);
+	for (l = servconn->msg_queue; l != NULL; l = l->next) {
+		entry = l->data;
+		if (entry->msg == msg)
+			break;
+		entry = NULL;
+	}
+	g_return_if_fail(entry != NULL);
+	msn_message_unref(msg);
+	servconn->msg_queue = g_slist_remove(servconn->msg_queue, entry);
+	if (entry->command != NULL)
+		g_free(entry->command);
+	g_free(entry);
 }
 void
 msn_servconn_register_command(MsnServConn *servconn, const char *command,
 							  MsnServConnCommandCb cb)

Mercurial > pidgin

comparison src/protocols/msn/servconn.c @ 5506:4f72b611f0ee