comparison src/protocols/msn/switchboard.c @ 8646:1e211dde3cae

[gaim-migrate @ 9398] Added a patch by shx to clean up the message-handling code and split the command stuff from it, among a few other things. Also, I fixed a crash in message parsing, which I think may close a couple bug reports. committer: Tailor Script <[e-mail]>

8645:47f647dd2ac3

	}

	return send_clientcaps(swboard);
}

static gboolean
msg_cmd(MsnServConn *servconn, const char *command, const char **params,
		 size_t param_count)
{
	gaim_debug(GAIM_DEBUG_INFO, "msn", "Found message. Parsing.\n");

	servconn->parsing_multiline = TRUE;
	servconn->multiline_type    = MSN_MULTILINE_MSG;
	servconn->multiline_len     = atoi(params[2]);

	servconn->msg_passport = g_strdup(params[0]);
	servconn->msg_friendly = g_strdup(params[1]);

	return TRUE;
}

static gboolean

	char *body;
	const char *value;

	body = gaim_escape_html(msn_message_get_body(msg));

	if (!strcmp(servconn->msg_passport, "[e-mail]") &&
		strstr(body, "immediate security update"))
	{
		g_free(body);

		return TRUE;
	}

	gaim_debug(GAIM_DEBUG_INFO, "msn", "Checking User-Agent...\n");

	if ((value = msn_message_get_attr(msg, "User-Agent")) != NULL) {
		gaim_debug(GAIM_DEBUG_MISC, "msn", "value = '%s'\n", value);
	}

	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL) {
		char *pre_format, *post_format;

		msn_parse_format(value, &pre_format, &post_format);

	if (swboard->chat != NULL)
	{
		serv_got_chat_in(gc,
						 gaim_conv_chat_get_id(GAIM_CONV_CHAT(swboard->chat)),
						 servconn->msg_passport, 0, body, time(NULL));
	}
	else
		serv_got_im(gc, servconn->msg_passport, body, 0, time(NULL));

	g_free(body);

	return TRUE;
}

	const char *value;

	if (swboard->chat == NULL &&
		(value = msn_message_get_attr(msg, "TypingUser")) != NULL) {

		serv_got_typing(gc, servconn->msg_passport, MSN_TYPING_RECV_TIMEOUT,
						GAIM_TYPING);
	}

	return TRUE;
}

	MsnSwitchBoard *swboard = servconn->data;
	MsnUser *user;
	GHashTable *clientcaps;
	const char *value;

	user = msn_user_new(session, servconn->msg_passport, NULL);

	clientcaps = msn_message_get_hashtable_from_body(msg);
#endif

	return TRUE;

		msn_servconn_register_command(servconn, "_unknown_",unknown_cmd);

		/* Register the message type callbacks. */
		msn_servconn_register_msg_type(servconn, "text/plain",plain_msg);
		msn_servconn_register_msg_type(servconn, "text/x-msmsgscontrol",
									  control_msg);
		msn_servconn_register_msg_type(servconn, "text/x-clientcaps",
									  clientcaps_msg);
		msn_servconn_register_msg_type(servconn, "text/x-clientinfo",
									  clientcaps_msg);
#if 0
		msn_servconn_register_msg_type(servconn, "application/x-msnmsgrp2p",
									   msn_p2p_msg);
#endif

gboolean
msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
{
	char *buf;
	size_t len;
	int ret;
#if 0
	FILE *fp;
#endif

	g_return_val_if_fail(swboard != NULL, FALSE);
	g_return_val_if_fail(msg     != NULL, FALSE);

	msn_message_set_transaction_id(msg, ++swboard->trId);
	buf = msn_message_to_string(msg, &len);

	g_return_val_if_fail(buf != NULL, FALSE);

	if (swboard->servconn->txqueue != NULL || !swboard->in_use) {
		gaim_debug(GAIM_DEBUG_INFO, "msn", "Appending message to queue.\n");

		swboard->servconn->txqueue =
			g_slist_append(swboard->servconn->txqueue, buf);

8646:1e211dde3cae

	}

	return send_clientcaps(swboard);
}

static void
msg_cmd_post(MsnServConn *servconn, char *payload, size_t len)
{
	MsnMessage *msg = msn_message_new();

	msg->passport = servconn->msg_passport;

	msn_message_parse_payload(msg, payload, len);

	msn_servconn_process_message(servconn, msg);

	msn_message_destroy(msg);
}

static gboolean
msg_cmd(MsnServConn *servconn, const char *command, const char **params,
		size_t param_count)
{
	gaim_debug(GAIM_DEBUG_INFO, "msn", "Found message. Parsing.\n");

	servconn->payload_cb  = msg_cmd_post;
	servconn->payload_len = atoi(params[2]);

	servconn->msg_passport = g_strdup(params[0]);

	return TRUE;
}

static gboolean

	char *body;
	const char *value;

	body = gaim_escape_html(msn_message_get_body(msg));

	if (!strcmp(msg->passport, "[e-mail]") &&
		strstr(body, "immediate security update"))
	{
		g_free(body);

		return TRUE;
	}

#if 0
	gaim_debug(GAIM_DEBUG_INFO, "msn", "Checking User-Agent...\n");

	if ((value = msn_message_get_attr(msg, "User-Agent")) != NULL) {
		gaim_debug(GAIM_DEBUG_MISC, "msn", "value = '%s'\n", value);
	}
#endif

	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL) {
		char *pre_format, *post_format;

		msn_parse_format(value, &pre_format, &post_format);

	if (swboard->chat != NULL)
	{
		serv_got_chat_in(gc,
						 gaim_conv_chat_get_id(GAIM_CONV_CHAT(swboard->chat)),
						 msg->passport, 0, body, time(NULL));
	}
	else
		serv_got_im(gc, msg->passport, body, 0, time(NULL));

	g_free(body);

	return TRUE;
}

	const char *value;

	if (swboard->chat == NULL &&
		(value = msn_message_get_attr(msg, "TypingUser")) != NULL) {

		serv_got_typing(gc, msg->passport, MSN_TYPING_RECV_TIMEOUT,
						GAIM_TYPING);
	}

	return TRUE;
}

	MsnSwitchBoard *swboard = servconn->data;
	MsnUser *user;
	GHashTable *clientcaps;
	const char *value;

	user = msn_user_new(session, msg->passport, NULL);

	clientcaps = msn_message_get_hashtable_from_body(msg);
#endif

	return TRUE;

		msn_servconn_register_command(servconn, "_unknown_",unknown_cmd);

		/* Register the message type callbacks. */
		msn_servconn_register_msg_type(servconn, "text/plain",plain_msg);
		msn_servconn_register_msg_type(servconn, "text/x-msmsgscontrol",
									   control_msg);
		msn_servconn_register_msg_type(servconn, "text/x-clientcaps",
									   clientcaps_msg);
		msn_servconn_register_msg_type(servconn, "text/x-clientinfo",
									   clientcaps_msg);
#if 0
		msn_servconn_register_msg_type(servconn, "application/x-msnmsgrp2p",
									   msn_p2p_msg);
#endif

gboolean
msn_switchboard_send_msg(MsnSwitchBoard *swboard, MsnMessage *msg)
{
	char *buf;
	char *payload;
	size_t len;
	size_t payload_len;
	int ret;
#if 0
	FILE *fp;
#endif

	g_return_val_if_fail(swboard != NULL, FALSE);
	g_return_val_if_fail(msg     != NULL, FALSE);

	buf = g_strdup_printf("MSG %d %c %d\r\n", ++swboard->trId,
						  msn_message_get_flag(msg), (int)msg->size);

	len = strlen(buf);

	payload = msn_message_gen_payload(msg, &payload_len);

	if (payload != NULL)
	{
		buf = g_realloc(buf, len + payload_len + 1);
		memcpy(buf + len, payload, payload_len);
		len += payload_len;
		buf[len] = 0;
	}

	if (swboard->servconn->txqueue != NULL || !swboard->in_use)
	{
		gaim_debug(GAIM_DEBUG_INFO, "msn", "Appending message to queue.\n");

		swboard->servconn->txqueue =
			g_slist_append(swboard->servconn->txqueue, buf);