comparison libpurple/protocols/msn/notification.c @ 20467:86da6ab1f612

Correctly process an additional <Service> with type Profile and name 'Messenger Roaming Identity' sent with the contact list using a recently registered WLM account, that was causing the initial ADL command to be sent malformed, and our presence status not being forwarded to our buddies

20466:a8599711efb7

	xmlnode *d_node,*c_node;
	char **tokens;
	char *email,*domain;
	char *list_op_str,*type_str;

	purple_debug_info("MaYuan","passport:%s type: %d\n",passport, type);
	tokens = g_strsplit(passport, "@", 2);
	email = tokens[0];
	domain = tokens[1];

	/*find a domain Node*/
	for(d_node = xmlnode_get_child(mlNode,"d"); d_node; d_node = xmlnode_get_next_twin(d_node))
	{
		const char * attr = NULL;
		purple_debug_info("MaYuan","d_node:%s\n",d_node->name);
		attr = xmlnode_get_attrib(d_node,"n");
		if(attr == NULL){
			continue;
		}
		if(!strcmp(attr,domain)){

	/*create contact node*/
	c_node = xmlnode_new("c");
	xmlnode_set_attrib(c_node,"n",email);

	list_op_str = g_strdup_printf("%d",list_op);
	purple_debug_info("MaYuan","list_op:%d\n",list_op);
	xmlnode_set_attrib(c_node,"l",list_op_str);
	g_free(list_op_str);

	if (type != MSN_USER_TYPE_UNKNOWN) {
		type_str = g_strdup_printf("%d", type);

static void
msn_notification_post_adl(MsnCmdProc *cmdproc, const char *payload, int payload_len)
{
	MsnTransaction *trans;

	purple_debug_info("MaYuan","Send ADL{%s}\n",payload);
	trans = msn_transaction_new(cmdproc, "ADL","%d",strlen(payload));
	msn_transaction_set_payload(trans, payload, strlen(payload));
	msn_cmdproc_send_trans(cmdproc, trans);
}

	char *payload;
	int payload_len;
	int adl_count = 0;
	const char *display_name;

	adl_node = xmlnode_new("ml");
	adl_node->child = NULL;
	xmlnode_set_attrib(adl_node, "l", "1");
	
	/*get the userlist*/

	purple_debug_info("MaYuan","Process ADL\n");

	if (!initial)
        {
                purple_debug_info("::","Initial ADL received\n");
                msn_session_finish_login(cmdproc->session);
        }
}

static void

{
	MsnSession *session;
	gint group_id;
	const char *group_name;

	session = cmdproc->session;

	group_id = atoi(cmd->params[3]);

	group_name = purple_url_decode(cmd->params[2]);

}

static void
ubx_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{
	purple_debug_info("MaYuan","UBX... \n");
	if(cmd->payload_len == 0){
		return;
	}
	cmdproc->last_cmd->payload_cb  = ubx_cmd_post;
}

static void
uux_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{
	purple_debug_info("MaYuan","UUX... \n");
}

/**************************************************************************
 * Message Types
 **************************************************************************/

{
	MsnSession *session;
	const char *value;
	const char *clLastChange;

	purple_debug_info("MaYuan","profile_msg... \n");
	session = cmdproc->session;

	if (strcmp(msg->remote_user, "Hotmail"))
		/* This isn't an official message. */
		return;

/*offline Message Notification*/
static void
delete_oim_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
{
}

static void
email_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
{

{
	MsnCmdProc *cmdproc;
	xmlnode *adl_node;
	char *payload;
	int payload_len;

	cmdproc = notification->servconn->cmdproc;

	adl_node = xmlnode_new("ml");
	adl_node->child = NULL;

	MsnTransaction *trans;
	xmlnode *rml_node;
	char *payload;
	int payload_len;

	cmdproc = notification->servconn->cmdproc;

	rml_node = xmlnode_new("ml");
	rml_node->child = NULL;

	msn_add_contact_xml(notification->session,rml_node,who,1,MSN_USER_TYPE_PASSPORT);

	payload = xmlnode_to_str(rml_node,&payload_len);
	xmlnode_free(rml_node);

	purple_debug_info("MaYuan","RML{%s}\n",payload);
	trans = msn_transaction_new(cmdproc, "RML","%d",strlen(payload));
	msn_transaction_set_payload(trans, payload, strlen(payload));
	msn_cmdproc_send_trans(cmdproc, trans);
}

20467:86da6ab1f612

	xmlnode *d_node,*c_node;
	char **tokens;
	char *email,*domain;
	char *list_op_str,*type_str;

	purple_debug_info("::","msn_add_contact_xml()\n");
	purple_debug_info("MaYuan","Passport: %s, type: %d\n",passport, type);
	tokens = g_strsplit(passport, "@", 2);
	email = tokens[0];
	domain = tokens[1];

	/*find a domain Node*/
	for(d_node = xmlnode_get_child(mlNode,"d"); d_node; d_node = xmlnode_get_next_twin(d_node))
	{
		const char * attr = NULL;
		purple_debug_info("MaYuan","d_node: %s\n",d_node->name);
		attr = xmlnode_get_attrib(d_node,"n");
		if(attr == NULL){
			continue;
		}
		if(!strcmp(attr,domain)){

	/*create contact node*/
	c_node = xmlnode_new("c");
	xmlnode_set_attrib(c_node,"n",email);

	list_op_str = g_strdup_printf("%d",list_op);
	purple_debug_info("MaYuan","list_op: %d\n",list_op);
	xmlnode_set_attrib(c_node,"l",list_op_str);
	g_free(list_op_str);

	if (type != MSN_USER_TYPE_UNKNOWN) {
		type_str = g_strdup_printf("%d", type);

static void
msn_notification_post_adl(MsnCmdProc *cmdproc, const char *payload, int payload_len)
{
	MsnTransaction *trans;
	purple_debug_info("::","msn_notification_post_adl()\n");
	purple_debug_info("MaYuan","Sending ADL with payload: %s\n",payload);
	trans = msn_transaction_new(cmdproc, "ADL","%d",strlen(payload));
	msn_transaction_set_payload(trans, payload, strlen(payload));
	msn_cmdproc_send_trans(cmdproc, trans);
}

	char *payload;
	int payload_len;
	int adl_count = 0;
	const char *display_name;

	purple_debug_info("::","msn_notification_dump_contact()\n");
	adl_node = xmlnode_new("ml");
	adl_node->child = NULL;
	xmlnode_set_attrib(adl_node, "l", "1");
	
	/*get the userlist*/

	purple_debug_info("MaYuan","Process ADL\n");

	if (!initial)
        {
                purple_debug_info("typ0","Initial ADL received\n");
                msn_session_finish_login(cmdproc->session);
        }
}

static void

{
	MsnSession *session;
	gint group_id;
	const char *group_name;

	purple_debug_info("::","adg_cmd()\n");
	
	session = cmdproc->session;

	group_id = atoi(cmd->params[3]);

	group_name = purple_url_decode(cmd->params[2]);

}

static void
ubx_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{
	purple_debug_info("typ0","UBX received.\n");
	if(cmd->payload_len == 0){
		return;
	}
	cmdproc->last_cmd->payload_cb  = ubx_cmd_post;
}

static void
uux_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
{
	purple_debug_info("typ0","UUX received.\n");
}

/**************************************************************************
 * Message Types
 **************************************************************************/

{
	MsnSession *session;
	const char *value;
	const char *clLastChange;

	purple_debug_info("::","profile_msg()\n");
	session = cmdproc->session;

	if (strcmp(msg->remote_user, "Hotmail"))
		/* This isn't an official message. */
		return;

/*offline Message Notification*/
static void
delete_oim_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
{
	purple_debug_info("::","delete_oim_msg()\n");
}

static void
email_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
{

{
	MsnCmdProc *cmdproc;
	xmlnode *adl_node;
	char *payload;
	int payload_len;
	purple_debug_info("::","msn_notification_add_buddy()\n");
	cmdproc = notification->servconn->cmdproc;

	adl_node = xmlnode_new("ml");
	adl_node->child = NULL;

	MsnTransaction *trans;
	xmlnode *rml_node;
	char *payload;
	int payload_len;

	purple_debug_info("::","msn_notification_rem_buddy()\n");
	cmdproc = notification->servconn->cmdproc;

	rml_node = xmlnode_new("ml");
	rml_node->child = NULL;

	msn_add_contact_xml(notification->session,rml_node,who,1,MSN_USER_TYPE_PASSPORT);

	payload = xmlnode_to_str(rml_node,&payload_len);
	xmlnode_free(rml_node);

	purple_debug_info("MaYuan","Send RML with payload {%s}\n",payload);
	trans = msn_transaction_new(cmdproc, "RML","%d",strlen(payload));
	msn_transaction_set_payload(trans, payload, strlen(payload));
	msn_cmdproc_send_trans(cmdproc, trans);
}