Mercurial > pidgin
changeset 23443:75be80ddeca5
Patch 1 from Qulogic, this one mostly updates the version sent by pidgin
committer: Ka-Hing Cheung <khc@hxbc.us>
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 26 Dec 2007 00:33:39 +0000 |
| parents | 63ebd65857f8 |
| children | 25899ec348a4 |
| 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 |
| diffstat | 7 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.h Tue Dec 25 23:00:27 2007 +0000 +++ b/libpurple/protocols/msn/msn.h Wed Dec 26 00:33:39 2007 +0000 @@ -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
--- a/libpurple/protocols/msn/msnutils.c Tue Dec 25 23:00:27 2007 +0000 +++ b/libpurple/protocols/msn/msnutils.c Wed Dec 26 00:33:39 2007 +0000 @@ -513,8 +513,8 @@ { 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;
--- a/libpurple/protocols/msn/notification.c Tue Dec 25 23:00:27 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Wed Dec 26 00:33:39 2007 +0000 @@ -343,7 +343,8 @@ */ 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 @@ 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 @@ 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);
--- a/libpurple/protocols/msn/notification.h Tue Dec 25 23:00:27 2007 +0000 +++ b/libpurple/protocols/msn/notification.h Wed Dec 26 00:33:39 2007 +0000 @@ -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@C7BWLYQX?5G" #define MSNP13_WLM_PRODUCT_ID "PROD01065C%ZFN6F" @@ -76,6 +81,6 @@ */ 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_ */
--- a/libpurple/protocols/msn/oim.c Tue Dec 25 23:00:27 2007 +0000 +++ b/libpurple/protocols/msn/oim.c Wed Dec 26 00:33:39 2007 +0000 @@ -243,7 +243,7 @@ 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 @@ 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) {
--- a/libpurple/protocols/msn/oim.h Tue Dec 25 23:00:27 2007 +0000 +++ b/libpurple/protocols/msn/oim.h Wed Dec 26 00:33:39 2007 +0000 @@ -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>"\
--- a/libpurple/protocols/msn/session.c Tue Dec 25 23:00:27 2007 +0000 +++ b/libpurple/protocols/msn/session.c Wed Dec 26 00:33:39 2007 +0000 @@ -45,8 +45,6 @@ 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;