Changeset e61f9d1 for protocols

Timestamp:

2015-11-28T18:32:21Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

25f6151

Parents:

4e4616a

Message:

msn: Send VER/CVR/USR together in the first request for faster login

File:

• protocols/msn/ns.c (modified) (3 diffs)

protocols/msn/ns.c

@@ -110 +110 @@
         struct im_connection *ic = md->ic;
 
+        /* this should be taken from XFR, but hardcoding it for now. it also prevents more redirects. */
+        const char *redir_data = "VmVyc2lvbjogMQ0KWGZyQ291bnQ6IDINCklzR2VvWGZyOiB0cnVlDQo=";
+
         if (source == -1 && !md->is_http) {
                 imcb_error(ic, "Could not connect to server");
@@ -135 +138 @@
         }
 
-        if (msn_ns_write(ic, source, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER)) {
+        /* Having to handle potential errors in each write sure makes these ifs awkward...*/
+
+        if (msn_ns_write(ic, source, "VER %d %s CVR0\r\n", ++md->trId, MSNP_VER) &&
+            msn_ns_write(ic, source, "CVR %d 0x0409 mac 10.2.0 ppc macmsgs 3.5.1 macmsgs %s %s\r\n",
+                         ++md->trId, ic->acc->user, redir_data) &&
+            msn_ns_write(ic, md->fd, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user)) {
+
                 if (!md->is_http) {
                         md->inpa = b_input_add(md->fd, B_EV_IO_READ, msn_ns_callback, md);
@@ -208 +217 @@
                 }
 
-                return(msn_ns_write(ic, md->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) {
                 /* We don't give a damn about the information we just received */
-                return msn_ns_write(ic, md->fd, "USR %d SSO I %s\r\n", ++md->trId, ic->acc->user);
         } else if (strcmp(cmd[0], "XFR") == 0) {
                 char *server;