Changeset 356e2dd for protocols/msn/msn.c

Timestamp:

2015-04-21T04:04:57Z (9 years ago)

Author:

dequis <dx@…>

Children:

b8c336b

Parents:

291c49b (diff), 71074ac (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

File:

• protocols/msn/msn.c (modified) (10 diffs)

protocols/msn/msn.c

@@ -30 +30 @@
 int msn_chat_id;
 GSList *msn_connections;
-GSList *msn_switchboards;
 
 static char *set_eval_display_name(set_t *set, char *value);
@@ -48 +47 @@
 
         set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
-        set_add(&acc->set, "switchboard_keepalives", "false", set_eval_bool, acc);
 
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |
@@ -64 +62 @@
 
         if (!server) {
-                imcb_error(ic, "The msn protocol is disabled in this version because most servers disabled MSNP18 over port 1863.");
-                imcb_error(ic, "If you find a working server, you can change the 'server' setting of this account. Good luck!");
-                imcb_error(ic, "See also: http://ismsndeadyet.com/"); // shameless plug
-                imc_logout(ic, FALSE);
-                return;
+                server = "geo.gateway.messenger.live.com";
         }
 
@@ -80 +74 @@
         md->away_state = msn_away_state_list;
         md->domaintree = g_tree_new(msn_domaintree_cmp);
-        md->ns->fd = -1;
+        md->fd = -1;
+        md->is_http = TRUE;
 
         msn_connections = g_slist_prepend(msn_connections, ic);
 
         imcb_log(ic, "Connecting");
-        msn_ns_connect(ic, md->ns, server,
+        msn_ns_connect(ic, server,
                        set_getint(&ic->acc->set, "port"));
 }
@@ -96 +91 @@
 
         if (md) {
-                msn_ns_close(md->ns);
-
-                while (md->switchboards) {
-                        msn_sb_destroy(md->switchboards->data);
-                }
-
-                msn_msgq_purge(ic, &md->msgq);
+                msn_ns_close(md);
+
                 msn_soapq_flush(ic, FALSE);
 
@@ -154 +144 @@
 {
         struct bee_user *bu = bee_user_by_handle(ic->bee, ic, who);
-        struct msn_buddy_data *bd = bu ? bu->data : NULL;
-        struct msn_switchboard *sb;
 
 #ifdef DEBUG
         if (strcmp(who, "raw") == 0) {
                 msn_ns_write(ic, -1, "%s\r\n", message);
-        } else
+                return 0;
+        }
 #endif
-        if (bd && bd->flags & MSN_BUDDY_FED) {
-                msn_ns_sendmessage(ic, bu, message);
-        } else if ((sb = msn_sb_by_handle(ic, who))) {
-                return(msn_sb_sendmessage(sb, message));
-        } else {
-                struct msn_message *m;
-
-                /* Create a message. We have to arrange a usable switchboard, and send the message later. */
-                m = g_new0(struct msn_message, 1);
-                m->who = g_strdup(who);
-                m->text = g_strdup(message);
-
-                return msn_sb_write_msg(ic, m);
-        }
-
+
+        msn_ns_sendmessage(ic, bu, message);
         return(0);
 }
@@ -198 +174 @@
 static void msn_set_away(struct im_connection *ic, char *state, char *message)
 {
-        char *uux;
         struct msn_data *md = ic->proto_data;
+        char *nick, *psm, *idle, *statecode, *body, *buf;
 
         if (state == NULL) {
@@ -207 +183 @@
         }
 
-        if (!msn_ns_write(ic, -1, "CHG %d %s %d:%02d\r\n", ++md->trId, md->away_state->code, MSN_CAP1, MSN_CAP2)) {
-                return;
-        }
-
-        uux = g_markup_printf_escaped("<EndpointData><Capabilities>%d:%02d"
-                                      "</Capabilities></EndpointData>",
-                                      MSN_CAP1, MSN_CAP2);
-        msn_ns_write(ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen(uux), uux);
-        g_free(uux);
-
-        uux = g_markup_printf_escaped("<PrivateEndpointData><EpName>%s</EpName>"
-                                      "<Idle>%s</Idle><ClientType>%d</ClientType>"
-                                      "<State>%s</State></PrivateEndpointData>",
-                                      md->uuid,
-                                      strcmp(md->away_state->code, "IDL") ? "false" : "true",
-                                      1,  /* ? */
-                                      md->away_state->code);
-        msn_ns_write(ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen(uux), uux);
-        g_free(uux);
-
-        uux = g_markup_printf_escaped("<Data><DDP></DDP><PSM>%s</PSM>"
-                                      "<CurrentMedia></CurrentMedia>"
-                                      "<MachineGuid>%s</MachineGuid></Data>",
-                                      message ? message : "", md->uuid);
-        msn_ns_write(ic, -1, "UUX %d %zd\r\n%s", ++md->trId, strlen(uux), uux);
-        g_free(uux);
+        statecode = (char *) md->away_state->code;
+        nick = set_getstr(&ic->acc->set, "display_name");
+        psm = message ? message : "";
+        idle = (strcmp(statecode, "IDL") == 0) ? "false" : "true";
+
+        body = g_markup_printf_escaped(MSN_PUT_USER_BODY,
+                nick, psm, psm, md->uuid, statecode, md->uuid, idle, statecode,
+                MSN_CAP1, MSN_CAP2, MSN_CAP1, MSN_CAP2
+        );
+
+        buf = g_strdup_printf(MSN_PUT_HEADERS, ic->acc->user, ic->acc->user, md->uuid,
+                "/user", "application/user+xml",
+                strlen(body), body);
+        msn_ns_write(ic, -1, "PUT %d %zd\r\n%s", ++md->trId, strlen(buf), buf);
+
+        g_free(buf);
+        g_free(body);
 }
 
@@ -258 +225 @@
 static void msn_chat_msg(struct groupchat *c, char *message, int flags)
 {
-        struct msn_switchboard *sb = msn_sb_by_chat(c);
-
-        if (sb) {
-                msn_sb_sendmessage(sb, message);
-        }
-        /* FIXME: Error handling (although this can't happen unless something's
-           already severely broken) disappeared here! */
+        /* TODO: groupchats*/
 }
 
 static void msn_chat_invite(struct groupchat *c, char *who, char *message)
 {
-        struct msn_switchboard *sb = msn_sb_by_chat(c);
-
-        if (sb) {
-                msn_sb_write(sb, "CAL %d %s\r\n", ++sb->trId, who);
-        }
+        /* TODO: groupchats*/
 }
 
 static void msn_chat_leave(struct groupchat *c)
 {
-        struct msn_switchboard *sb = msn_sb_by_chat(c);
-
-        if (sb) {
-                msn_sb_write(sb, "OUT\r\n");
-        }
+        /* TODO: groupchats*/
 }
 
 static struct groupchat *msn_chat_with(struct im_connection *ic, char *who)
 {
-        struct msn_switchboard *sb;
+        /* TODO: groupchats*/
         struct groupchat *c = imcb_chat_new(ic, who);
-
-        if ((sb = msn_sb_by_handle(ic, who))) {
-                debug("Converting existing switchboard to %s to a groupchat", who);
-                return msn_sb_to_chat(sb);
-        } else {
-                struct msn_message *m;
-
-                /* Create a magic message. This is quite hackish, but who cares? :-P */
-                m = g_new0(struct msn_message, 1);
-                m->who = g_strdup(who);
-                m->text = g_strdup(GROUPCHAT_SWITCHBOARD_MESSAGE);
-
-                msn_sb_write_msg(ic, m);
-
-                return c;
-        }
+        return c;
 }
 
@@ -324 +262 @@
 static void msn_add_deny(struct im_connection *ic, char *who)
 {
-        struct msn_switchboard *sb;
-
         msn_buddy_list_add(ic, MSN_BUDDY_BL, who, who, NULL);
-
-        /* If there's still a conversation with this person, close it. */
-        if ((sb = msn_sb_by_handle(ic, who))) {
-                msn_sb_destroy(sb);
-        }
 }