Changeset 95fdf22

Timestamp:

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

Author:

dequis <dx@…>

Children:

6a89740

Parents:

d2411a1

git-author:

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

git-committer:

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

Message:

msn: remove some MSNP21 commands

File:

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

protocols/msn/ns.c

@@ -265 +265 @@
                         return(0);
                 }
-        } else if (strcmp(cmd[0], "MSG") == 0) {
-                if (num_parts < 4) {
-                        imcb_error(ic, "Syntax error");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
-
-                md->msglen = atoi(cmd[3]);
-
-                if (md->msglen <= 0) {
-                        imcb_error(ic, "Syntax error");
-                        imc_logout(ic, TRUE);
-                        return(0);
-                }
         } else if (strcmp(cmd[0], "ADL") == 0) {
                 if (num_parts >= 3 && strcmp(cmd[2], "OK") == 0) {
                         msn_ns_send_adl(ic);
                         return msn_ns_finish_login(ic);
-                } else if (num_parts >= 3) {
-                        md->msglen = atoi(cmd[2]);
                 }
         } else if (strcmp(cmd[0], "CHL") == 0) {
@@ -309 +293 @@
                 imc_logout(ic, TRUE);
                 return(0);
-        } else if (strcmp(cmd[0], "GCF") == 0) {
-                /* Coming up is cmd[2] bytes of stuff we're supposed to
-                   censore. Meh. */
-                md->msglen = atoi(cmd[2]);
-        } else if ((strcmp(cmd[0], "NFY") == 0) || (strcmp(cmd[0], "SDG") == 0)) {
-                if (num_parts >= 3) {
-                        md->msglen = atoi(cmd[2]);
-                }
-        } else if (strcmp(cmd[0], "PUT") == 0) {
-                if (num_parts >= 4) {
-                        md->msglen = atoi(cmd[3]);
-                }
-        } else if (strcmp(cmd[0], "NOT") == 0) {
-                if (num_parts >= 2) {
-                        md->msglen = atoi(cmd[1]);
-                }
         } else if (strcmp(cmd[0], "QNG") == 0) {
                 ic->flags |= OPT_PONGED;
@@ -337 +305 @@
                         return(0);
                 }
-
-                /* Oh yes, errors can have payloads too now. Discard them for now. */
-                if (num_parts >= 3) {
-                        md->msglen = atoi(cmd[2]);
-                }
+        } else if ((strcmp(cmd[0], "SDG") == 0) || (strcmp(cmd[0], "NFY") == 0)) {
+                msn_ns_structured_message(md, msg, msglen, cmd);
         } else {
                 imcb_error(ic, "Received unknown command from main server: %s", cmd[0]);
@@ -354 +319 @@
         char *body;
         int blen = 0;
-
-        if (!num_parts) {
-                return(1);
-        }
 
         if ((body = strstr(msg, "\r\n\r\n"))) {
@@ -474 +435 @@
                         }
                 }
-        } else if ((strcmp(cmd[0], "SDG") == 0) || (strcmp(cmd[0], "NFY") == 0)) {
-                msn_ns_structured_message(md, msg, msglen, cmd);
         }