Changeset 8bcd160 for protocols/msn

Timestamp:

2015-04-06T16:22:05Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a9b1e0e

Parents:

e3e2059

git-author:

dequis <dx@…> (24-01-15 20:20:42)

git-committer:

dequis <dx@…> (06-04-15 16:22:05)

Message:

msn: remove old/broken/unused msnftp stuff (requires distclean!)

Since this removes invitation.h, do "make distclean" to fix build errors

MSNFTP is a file transfer method used by early msn messenger versions,
and has been replaced by MSNP2P probably 10 years ago.

This code was disabled/commented out in bitlbee

Location:

protocols/msn

Files:

• invitation.c (deleted)
• invitation.h (deleted)
• msn.c (modified) (2 diffs)
• sb.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -96 +96 @@
 
         if (md) {
-                /** Disabling MSN ft support for now.
-                while( md->filetransfers ) {
-                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
-                }
-                */
-
                 msn_ns_close(md->ns);
 
@@ -470 +464 @@
         ret->buddy_action = msn_buddy_action;
 
-        //ret->transfer_request = msn_ftp_transfer_request;
-
         register_protocol(ret);
 }

protocols/msn/sb.c

@@ -29 +29 @@
 #include "md5.h"
 #include "soap.h"
-#include "invitation.h"
 
 static gboolean msn_sb_callback(gpointer data, gint source, b_input_condition cond);
@@ -182 +181 @@
                 } else if (strcmp(text, SB_KEEPALIVE_MESSAGE) == 0) {
                         buf = g_strdup(MSN_SB_KEEPALIVE_HEADERS);
-                        i = strlen(buf);
-                } else if (strncmp(text, MSN_INVITE_HEADERS, sizeof(MSN_INVITE_HEADERS) - 1) == 0) {
-                        buf = g_strdup(text);
                         i = strlen(buf);
                 } else {
@@ -664 +660 @@
                         }
                 }
-#if 0
-                // Disable MSN ft support for now.
-                else if (g_strncasecmp(ct, "text/x-msmsgsinvite", 19) == 0) {
-                        char *command = get_rfc822_header(body, "Invitation-Command:", blen);
-                        char *cookie = get_rfc822_header(body, "Invitation-Cookie:", blen);
-                        unsigned int icookie;
-
-                        g_free(ct);
-
-                        /* Every invite should have both a Command and Cookie header */
-                        if (!command || !cookie) {
-                                g_free(command);
-                                g_free(cookie);
-                                imcb_log(ic, "Warning: No command or cookie from %s", sb->who);
-                                return 1;
-                        }
-
-                        icookie = strtoul(cookie, NULL, 10);
-                        g_free(cookie);
-
-                        if (g_strncasecmp(command, "INVITE", 6) == 0) {
-                                msn_invitation_invite(sb, cmd[1], icookie, body, blen);
-                        } else if (g_strncasecmp(command, "ACCEPT", 6) == 0) {
-                                msn_invitation_accept(sb, cmd[1], icookie, body, blen);
-                        } else if (g_strncasecmp(command, "CANCEL", 6) == 0) {
-                                msn_invitation_cancel(sb, cmd[1], icookie, body, blen);
-                        } else {
-                                imcb_log(ic, "Warning: Received invalid invitation with "
-                                         "command %s from %s", command, sb->who);
-                        }
-
-                        g_free(command);
-                }
-#endif
                 else if (g_strncasecmp(ct, "application/x-msnmsgrp2p", 24) == 0) {
                         /* Not currently implemented. Don't warn about it since