Changeset 3752019 for protocols

Timestamp:

2015-03-15T14:41:47Z (10 years ago)

Author:

dequis <dx@…>

Children:

ffa5b70

Parents:

fa8c775

git-author:

dequis <dx@…> (08-03-15 04:28:49)

git-committer:

dequis <dx@…> (15-03-15 14:41:47)

Message:

msn: start update to msnp21

• bump protocol version
• update CVR parameters
• don't send BLP, send ADL right after getting contact list
• NFY payload size parsing
• MSNP21 style ADL

Location:

protocols/msn

Files:

• msn.h (modified) (1 diff)
• ns.c (modified) (6 diffs)

protocols/msn/msn.h

@@ -60 +60 @@
 #define MSNP11_PROD_KEY "C1BX{V4W}Q3*10SM"
 #define MSNP11_PROD_ID  "PROD0120PW!CCV9@"
-#define MSNP_VER        "MSNP18"
+#define MSNP_VER        "MSNP21"
 #define MSNP_BUILD      "14.0.8117.416"
 

protocols/msn/ns.c

@@ -185 +185 @@
                 }
 
-                return(msn_ns_write(ic, handler->fd, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s\r\n",
+                return(msn_ns_write(ic, handler->fd, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s VmVyc2lvbjogMQ0KWGZyQ291bnQ6IDINClhmclNlbnRVVENUaW1lOiA2MzU2MTQ3OTU5NzgzOTAwMDANCklzR2VvWGZyOiB0cnVlDQo=\r\n",
                                     ++md->trId, ic->acc->user));
         } else if (strcmp(cmd[0], "CVR") == 0) {
@@ -297 +297 @@
                         return(0);
                 }
-        } else if (strcmp(cmd[0], "BLP") == 0) {
-                msn_ns_send_adl_start(ic);
-                return msn_ns_finish_login(ic);
         } else if (strcmp(cmd[0], "ADL") == 0) {
                 if (num_parts >= 3 && strcmp(cmd[2], "OK") == 0) {
@@ -497 +494 @@
                         handler->msglen = atoi(cmd[1]);
                 }
+        } else if (strcmp(cmd[0], "NFY") == 0) {
+                if (num_parts >= 3) {
+                        handler->msglen = atoi(cmd[2]);
+                }
         } else if (strcmp(cmd[0], "UBM") == 0) {
                 if (num_parts >= 7) {
@@ -768 +769 @@
 void msn_auth_got_contact_list(struct im_connection *ic)
 {
-        struct msn_data *md;
-
         /* Dead connection? */
         if (g_slist_find(msn_connections, ic) == NULL) {
@@ -775 +774 @@
         }
 
-        md = ic->proto_data;
-        msn_ns_write(ic, -1, "BLP %d %s\r\n", ++md->trId, "BL");
+        msn_ns_send_adl_start(ic);
+        msn_ns_finish_login(ic);
 }
 
 static gboolean msn_ns_send_adl_1(gpointer key, gpointer value, gpointer data)
 {
-        struct xt_node *adl = data, *d, *c;
+        struct xt_node *adl = data, *d, *c, *s;
         struct bee_user *bu = value;
         struct msn_buddy_data *bd = bu->data;
@@ -810 +809 @@
         c = xt_new_node("c", NULL, NULL);
         xt_add_attr(c, "n", handle);
-        xt_add_attr(c, "l", l);
         xt_add_attr(c, "t", "1");   /* FIXME: Network type, i.e. 32 for Y!MSG */
+        s = xt_new_node("s", NULL, NULL);
+        xt_add_attr(s, "n", "IM");
+        xt_add_attr(s, "l", l);
+        xt_insert_child(c, s);
         xt_insert_child(d, c);