Mercurial > pidgin.yaz

changeset 6883:ac638b90da44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7429] Eh, whatever. New MSNSLP snapshot. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 18 Sep 2003 02:54:32 +0000
parents 4f8258b2bb8d
children 5bd9f201b4bf
files src/protocols/msn/msnslp.c src/protocols/msn/msnslp.h src/protocols/msn/switchboard.c
diffstat 3 files changed, 24 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/msn/msnslp.c	Thu Sep 18 02:53:11 2003 +0000
+++ b/src/protocols/msn/msnslp.c	Thu Sep 18 02:54:32 2003 +0000
@@ -42,6 +42,15 @@
 {
 	g_return_if_fail(session != NULL);
 
+	if (session->orig_body != NULL)
+		g_free(session->orig_body);
+
+	if (session->outgoing_msg != NULL)
+		msn_message_unref(session->outgoing_msg);
+
+	if (session->call_id != NULL)
+		g_free(session->call_id);
+
 	g_free(session);
 }
 
@@ -135,7 +144,7 @@
 
 	msg->msnslp_header.id = slpsession->prev_msg_id;
 //	msg->msnslp_header.ack_session_id = rand() % 0xFFFFFF00;
-	msg->msnslp_header.ack_session_id = 1980589;
+	msg->msnslp_header.ack_session_id = 0x1407C7DE;
 
 	msn_message_set_charset(msg, NULL);
 
@@ -203,7 +212,6 @@
 	char *msnobj_data;
 	char *msnobj_base64;
 	char *branch;
-	char *call_id;
 	char *content;
 	char *body;
 
@@ -233,19 +241,19 @@
 							 rand() % 0xAAFF + 0x1111,
 							 rand() % 0xAAFF + 0x1111);
 
-	call_id = g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
-							  rand() % 0xAAFF + 0x1111,
-							  rand() % 0xAAFF + 0x1111,
-							  rand() % 0xAAFF + 0x1111,
-							  rand() % 0xAAFF + 0x1111,
-							  rand() % 0xAAFF + 0x1111,
-							  rand() % 0xAAFF + 0x1111,
-							  rand() % 0xAAFF + 0x1111,
-							  rand() % 0xAAFF + 0x1111);
+	slpsession->call_id = g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
+										  rand() % 0xAAFF + 0x1111,
+										  rand() % 0xAAFF + 0x1111,
+										  rand() % 0xAAFF + 0x1111,
+										  rand() % 0xAAFF + 0x1111,
+										  rand() % 0xAAFF + 0x1111,
+										  rand() % 0xAAFF + 0x1111,
+										  rand() % 0xAAFF + 0x1111,
+										  rand() % 0xAAFF + 0x1111);
 
 	content = g_strdup_printf(
 		"EUF-GUID: {A4268EEC-FEC5-49E5-95C3-F126696BDBF6}\r\n"
-		"SessionID: %ld\r\n"
+		"SessionID: %lu\r\n"
 		"AppID: 1\r\n"
 		"Context: %s",
 		session_id,
@@ -270,13 +278,12 @@
 		msn_user_get_passport(remote_user),
 		msn_user_get_passport(local_user),
 		branch,
-		call_id,
+		slpsession->call_id,
 		strlen(content) + 5,
 		content);
 
 	g_free(content);
 	g_free(branch);
-	g_free(call_id);
 
 	gaim_debug_misc("msn", "Message = {%s}\n", body);
 
--- a/src/protocols/msn/msnslp.h	Thu Sep 18 02:53:11 2003 +0000
+++ b/src/protocols/msn/msnslp.h	Thu Sep 18 02:54:32 2003 +0000
@@ -35,6 +35,8 @@
 
 	MsnSwitchBoard *swboard;
 
+	char *call_id;
+
 	long session_id;
 	long base_id;
 	long prev_msg_id;
--- a/src/protocols/msn/switchboard.c	Thu Sep 18 02:53:11 2003 +0000
+++ b/src/protocols/msn/switchboard.c	Thu Sep 18 02:54:32 2003 +0000
@@ -89,7 +89,7 @@
 	MsnSwitchBoard *swboard = servconn->data;
 	MsnSession *session = servconn->session;
 
-	send_clientcaps(swboard);
+	//send_clientcaps(swboard);
 
 	if (session->protocol_ver >= 9)
 	{