Changeset d2411a1

Timestamp:

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

Author:

dequis <dx@…>

Children:

95fdf22

Parents:

074c9b6

git-author:

dequis <dx@…> (11-04-15 20:17:30)

git-committer:

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

Message:

msn: all commands have a payload size now, simplify parsing

Location:

protocols/msn

Files:

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

protocols/msn/msn.h

@@ -225 +225 @@
 int msn_ns_send_typing(struct im_connection *ic, struct bee_user *bu);
 int msn_ns_send_message(struct im_connection *ic, struct bee_user *bu, const char *text);
-int msn_ns_command(struct msn_data *md, char **cmd, int num_parts);
+int msn_ns_command(struct msn_data *md, char **cmd, int num_parts, char *msg, int msglen);
 int msn_ns_message(struct msn_data *md, char *msg, int msglen, char **cmd, int num_parts);
 

protocols/msn/msn_util.c

@@ -185 +185 @@
 }
 
+
+static int msn_handle_command(struct msn_data *h) {
+        char *msg, **cmd;
+        int count, st;
+
+        msg = g_strndup(h->rxq, h->msglen);
+
+        cmd = g_strsplit_set(h->cmd_text, " ", -1);
+        count = g_strv_length(cmd);
+
+        st = msn_ns_command(h, cmd, count, msg, h->msglen);
+
+        g_strfreev(cmd);
+        g_free(msg);
+
+        g_free(h->cmd_text);
+        h->cmd_text = NULL;
+
+        return st;
+}
+
 /* This one handles input from a MSN Messenger server. Both the NS and SB servers usually give
    commands, but sometimes they give additional data (payload). This function tries to handle
@@ -203 +224 @@
                         for (i = 0; i < h->rxlen; i++) {
                                 if (h->rxq[i] == '\r' || h->rxq[i] == '\n') {
-                                        char *cmd_text, **cmd;
-                                        int count;
+                                        char *cmd_text, *last_param;
+                                        guint64 parsed_len;
 
                                         cmd_text = g_strndup(h->rxq, i);
-                                        cmd = g_strsplit_set(cmd_text, " ", -1);
-                                        count = g_strv_length(cmd);
-
-                                        st = msn_ns_command(h, cmd, count);
-
-                                        g_strfreev(cmd);
-                                        g_free(cmd_text);
-
-                                        /* If the connection broke, don't continue. We don't even exist anymore. */
-                                        if (!st) {
-                                                return(0);
+
+                                        /* find the position of the last parameter from the end */
+                                        last_param = cmd_text + i;
+                                        while (last_param != cmd_text && last_param[-1] != ' ') {
+                                                last_param--;
                                         }
 
-                                        if (h->msglen) {
-                                                h->cmd_text = g_strndup(h->rxq, i);
+                                        /* that parameter is the payload size */
+                                        if (!parse_int64(last_param, 10, &parsed_len)) {
+                                                return -1;
                                         }
 
-                                        /* Skip to the next non-emptyline */
-                                        while (i < h->rxlen && (h->rxq[i] == '\r' || h->rxq[i] == '\n')) {
-                                                i++;
+                                        h->msglen = (int) parsed_len;
+                                        h->cmd_text = cmd_text;
+
+                                        /* if there's no payload, handle it right away */
+                                        if (parsed_len == 0 && !msn_handle_command(h)) {
+                                                return 0;
                                         }
+
+                                        /* Skip the \r\n */
+                                        i += 2;
 
                                         break;
@@ -239 +261 @@
                         }
                 } else {
-                        char *msg, **cmd;
-                        int count;
 
                         /* Do we have the complete message already? */
                         if (h->msglen > h->rxlen) {
                                 break;
-                        }
-
-                        msg = g_strndup(h->rxq, h->msglen);
-
-                        cmd = g_strsplit_set(h->cmd_text, " ", -1);
-                        count = g_strv_length(cmd);
-
-                        st = msn_ns_message(h, msg, h->msglen, cmd, count);
-
-                        g_strfreev(cmd);
-                        g_free(msg);
-                        g_free(h->cmd_text);
-                        h->cmd_text = NULL;
-
-                        if (!st) {
-                                return(0);
+                        } else if (!msn_handle_command(h)) {
+                                return 0;
                         }
 

protocols/msn/ns.c

@@ -198 +198 @@
 }
 
-int msn_ns_command(struct msn_data *md, char **cmd, int num_parts)
+int msn_ns_command(struct msn_data *md, char **cmd, int num_parts, char *msg, int msglen)
 {
         struct im_connection *ic = md->ic;