im.pidgin.pidgin.khc.msnp15: a13ab86228a43d576c769fe321ba1375c7e4cab8
quantum.analyst at gmail.com
quantum.analyst at gmail.com
Fri Dec 28 02:21:21 EST 2007
-----------------------------------------------------------------
Revision: a13ab86228a43d576c769fe321ba1375c7e4cab8
Ancestor: eec3e53a4ae2cbb4d7f307c132c9f9e5a020f8b1
Author: quantum.analyst at gmail.com
Date: 2007-12-26T00:33:39
Branch: im.pidgin.pidgin.khc.msnp15
Modified files:
libpurple/protocols/msn/msn.h
libpurple/protocols/msn/msnutils.c
libpurple/protocols/msn/notification.c
libpurple/protocols/msn/notification.h
libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
libpurple/protocols/msn/session.c
ChangeLog:
Patch 1 from Qulogic, this one mostly updates the version sent by pidgin
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.h dd2839c8e0ff2373f91d8757a85d934fda4d6b9f
+++ libpurple/protocols/msn/msn.h f439804fe5b0b86f9c52cd47be59fea92d1f78e5
@@ -66,12 +66,10 @@
/* Windows Live Messenger Server*/
#define WLM_SERVER "muser.messenger.hotmail.com"
#define WLM_PORT 1863
-#define WLM_PROT_VER 13
-/*This MSNP14 Support chat with Yahoo Messenger*/
-#define WLM_YAHOO_PROT_VER 14
+#define WLM_PROT_VER 15
-#define WLM_MAX_PROTOCOL 14
-#define WLM_MIN_PROTOCOL 13
+#define WLM_MAX_PROTOCOL 15
+#define WLM_MIN_PROTOCOL 15
#define MSN_TYPING_RECV_TIMEOUT 6
#define MSN_TYPING_SEND_TIMEOUT 4
============================================================
--- libpurple/protocols/msn/msnutils.c 10b96dd4da6fa65290b4ca3dcf04d4b8aed6c6fd
+++ libpurple/protocols/msn/msnutils.c c2ae966b89fd145c7b77e90b5f3c5cf353d73a7c
@@ -513,8 +513,8 @@ msn_handle_chl(char *input, char *output
{
PurpleCipher *cipher;
PurpleCipherContext *context;
- char *productKey = MSNP13_WLM_PRODUCT_KEY,
- *productID = MSNP13_WLM_PRODUCT_ID,
+ char *productKey = MSNP15_WLM_PRODUCT_KEY,
+ *productID = MSNP15_WLM_PRODUCT_ID,
*hexChars = "0123456789abcdef",
buf[BUFSIZE];
unsigned char md5Hash[16], *newHash;
============================================================
--- libpurple/protocols/msn/notification.c a381136b6a41d2e07e8deb4c4ca5c6c4b3d8a395
+++ libpurple/protocols/msn/notification.c 86890bb08028eee3504314d06c13821ad52000a7
@@ -343,7 +343,8 @@ ver_cmd(MsnCmdProc *cmdproc, MsnCommand
*/
msn_cmdproc_send(cmdproc, "CVR",
// "0x0409 winnt 5.1 i386 MSG80BETA 8.0.0689 msmsgs %s",
- "0x0804 winnt 5.1 i386 MSNMSGR 8.0.0792 msmsgs %s",
+// "0x0804 winnt 5.1 i386 MSNMSGR 8.0.0792 msmsgs %s",
+ "0x0409 winnt 5.1 i386 MSNMSGR 8.5.1288.816 msmsgs %s",
purple_account_get_username(account));
}
@@ -550,7 +551,7 @@ chl_cmd(MsnCmdProc *cmdproc, MsnCommand
context = purple_cipher_context_new(cipher, NULL);
purple_cipher_context_append(context, (const guchar *)cmd->params[1],
strlen(cmd->params[1]));
- challenge_resp = MSNP13_WLM_PRODUCT_KEY;
+ challenge_resp = MSNP15_WLM_PRODUCT_KEY;
purple_cipher_context_append(context, (const guchar *)challenge_resp,
strlen(challenge_resp));
@@ -565,7 +566,7 @@ chl_cmd(MsnCmdProc *cmdproc, MsnCommand
msn_handle_chl(cmd->params[1], buf);
#endif
// purple_debug_info("MSNP14","<<challenge:{%s}:{%s}\n",cmd->params[1],buf);
- trans = msn_transaction_new(cmdproc, "QRY", "%s 32", MSNP13_WLM_PRODUCT_ID);
+ trans = msn_transaction_new(cmdproc, "QRY", "%s 32", MSNP15_WLM_PRODUCT_ID);
msn_transaction_set_payload(trans, buf, 32);
============================================================
--- libpurple/protocols/msn/notification.h d2d9b811660099378399c07f59ca34f92c72bca2
+++ libpurple/protocols/msn/notification.h 06caf7f89c04942c98782be61afa424d5a532907
@@ -25,6 +25,11 @@
#define _MSN_NOTIFICATION_H_
/*MSN protocol challenge info*/
+
+/*MSNP15 challenge: WLM 8.5.1288.816*/
+#define MSNP15_WLM_PRODUCT_KEY "ILTXC!4IXB5FB*PX"
+#define MSNP15_WLM_PRODUCT_ID "PROD0119GSJUC$18"
+
/*MSNP13 challenge*/
#define MSNP13_WLM_PRODUCT_KEY "O4BG at C7BWLYQX?5G"
#define MSNP13_WLM_PRODUCT_ID "PROD01065C%ZFN6F"
@@ -76,6 +81,6 @@ void msn_notification_close(MsnNotificat
*/
void msn_notification_close(MsnNotification *notification);
-void msn_got_login_params(MsnSession *session, const char *login_params);
+void msn_got_login_params(MsnSession *session, const char *ticket, const char *response);
#endif /* _MSN_NOTIFICATION_H_ */
============================================================
--- libpurple/protocols/msn/oim.c 4ff5b0d2e4a50e78154b347eb6f8f72b3db795b1
+++ libpurple/protocols/msn/oim.c a2a5dd622dab1100c66ec242146641173fa29260
@@ -243,7 +243,7 @@ msn_oim_send_msg(MsnOim *oim)
oim_request->friendname,
oim_request->to_member,
mspauth,
- MSNP13_WLM_PRODUCT_ID,
+ MSNP15_WLM_PRODUCT_ID,
oim->challenge ? oim->challenge : "",
oim->send_seq,
msg_body);
@@ -472,7 +472,7 @@ msn_parse_oim_msg(MsnOim *oim,const char
xmlnode *iu_node;
MsnSession *session = oim->session;
- purple_debug_info("MSNP14:OIM", "%s", xmlmsg);
+ purple_debug_info("MSNP14:OIM", "%s\n", xmlmsg);
node = xmlnode_from_str(xmlmsg, -1);
if (strcmp(node->name, "MD") != 0) {
============================================================
--- libpurple/protocols/msn/oim.h 131ee5608c6ea10a93eccdcceaa78d607af12ded
+++ libpurple/protocols/msn/oim.h 94d3c95e519fd6c01f264cb5a53afb94d5e9c8fc
@@ -77,7 +77,7 @@
#define MSN_OIM_SEND_HOST "ows.messenger.msn.com"
#define MSN_OIM_SEND_URL "/OimWS/oim.asmx"
-#define MSN_OIM_SEND_SOAP_ACTION "http://messenger.msn.com/ws/2004/09/oim/Store"
+#define MSN_OIM_SEND_SOAP_ACTION "http://messenger.live.com/ws/2006/09/oim/Store2"
#define MSN_OIM_SEND_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"\
"<soap:Header>"\
============================================================
--- libpurple/protocols/msn/session.c 1f88d11f445951bdf327e9a207bf9cf85f0be0d9
+++ libpurple/protocols/msn/session.c cd1943a62351aa34cb340359af0f90040ca74bfc
@@ -45,8 +45,6 @@ msn_session_new(PurpleAccount *account)
purple_account_get_username(account), NULL);
session->oim = msn_oim_new(session);
- /*if you want to chat with Yahoo Messenger*/
- //session->protocol_ver = WLM_YAHOO_PROT_VER;
session->protocol_ver = WLM_PROT_VER;
session->conv_seq = 1;
More information about the Commits
mailing list