Changeset 899c8e8

Timestamp:

2015-05-31T02:40:05Z (9 years ago)

Author:

dequis <dx@…>

Children:

3fb7139

Parents:

ef9ee0e

git-author:

dequis <dx@…> (19-04-15 07:36:06)

git-committer:

dequis <dx@…> (31-05-15 02:40:05)

Message:

msn: misc MSNP24 command format changes

Location:

protocols/msn

Files:

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

protocols/msn/msn.c

@@ -191 +191 @@
                 "/user", "application/user+xml",
                 strlen(body), body);
-        msn_ns_write(ic, "PUT %d %zd\r\n%s", ++md->trId, strlen(buf), buf);
+        msn_ns_write_cmd(ic, "PUT", "MSGR\\PRESENCE", buf);
 
         g_free(buf);

protocols/msn/msn.h

@@ -199 +199 @@
 /* ns.c */
 int msn_ns_write(struct im_connection *ic, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
+int msn_ns_write_cmd(struct im_connection *ic, const char *cmd, const char *params, const char *payload);
 gboolean msn_ns_connect(struct im_connection *ic, const char *host, int port);
 void msn_ns_close(struct msn_data *handler);

protocols/msn/ns.c

@@ -294 +294 @@
                 g_free(resp);
 
-        } else if (strcmp(cmd[0], "ADL") == 0) {
-                if (num_parts >= 3 && strcmp(cmd[2], "OK") == 0) {
+        } else if (strcmp(cmd[0], "PUT") == 0) {
+                /* We could keep track TrIDs... or we could guess what this PUT means */
+                if ((md->flags & MSN_DONE_BND) && !(md->flags & MSN_DONE_ADL)) {
                         msn_ns_send_adl(ic);
                         return msn_ns_finish_login(ic);
@@ -473 +474 @@
 
         } else if ((strcmp(cmd[0], "NFY") == 0) && (action = get_rfc822_header(parts[2], "Uri", 0))) {
-                gboolean is_put = (strcmp(cmd[1], "PUT") == 0);
+                gboolean is_put = (strcmp(cmd[2], "MSGR\\PUT") == 0);
                 msn_ns_nfy(md, who, parts, action, is_put);
         }
@@ -657 +658 @@
         adls = xt_to_string(adl);
         xt_free_node(adl);
-        msn_ns_write(ic, "ADL %d %zd\r\n%s", ++md->trId, strlen(adls), adls);
+        msn_ns_write_cmd(ic, "PUT", "MSGR\\CONTACTS", adls);
         g_free(adls);
 }
@@ -714 +715 @@
 
         buf = g_strdup_printf(MSN_MESSAGE_HEADERS, bu->handle, ic->acc->user, md->uuid, message_type, strlen(text), text);
-        retval = msn_ns_write(ic, "SDG %d %zd\r\n%s", ++md->trId, strlen(buf), buf);
+        retval = msn_ns_write_cmd(ic, "SDG", "MSGR", buf);
         g_free(buf);
         return retval;