libpurple-patches/01-msn_xfer.patch

   1 pidgin/libpurple/protocols/msn: Hack the MSN FT impl to use ui_ops.
   2
   3 * msn/slplink.c will now use ui_read and ui_write if present instead
   4   of trying to directly use dest_fp (which may not even exist).
   5 * It also now uses the xfer's size property if set instead of trying
   6   to stat the local file (which also may not exist).
   7
   8 This is a minimal conversion which probably has a number of
   9 reliability issues. Someday the MSN prpl's file transfers should
  10 probably be integrated with ft.c's intended sequence of events.
  11
  12 diff a/pidgin/libpurple/protocols/msn/slplink.c b/pidgin/libpurple/protocols/msn/slplink.c
  13 --- a/pidgin/libpurple/protocols/msn/slplink.c
  14 +++ b/pidgin/libpurple/protocols/msn/slplink.c
  15 @@ -232,6 +232,33 @@ msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
  16         }
  17  }
  18
  19 +/* Return the associated xfer iff the xfer is ready to read/write. */
  20 +static PurpleXfer *
  21 +msn_get_ready_xfer(MsnSlpLink *slplink,
  22 +                   MsnSlpMessage *slpmsg,
  23 +                   PurpleXferType want_type)
  24 +{
  25 +       PurpleXfer *xfer = NULL;
  26 +
  27 +       MsnSlpCall *slpcall = slpmsg->slpcall;
  28 +       if (slpcall == NULL && slpmsg->session_id) {
  29 +               slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id);
  30 +       }
  31 +       if (slpcall) {
  32 +               xfer = (PurpleXfer *)(slpcall->xfer);
  33 +       }
  34 +       /* Can't use the priv->ready system because MSN read/write code
  35 +        * assumes it's not there (and it's private).
  36 +        */
  37 +       if (! xfer
  38 +          || (! xfer->status & (PURPLE_XFER_STATUS_STARTED | PURPLE_XFER_STATUS_DONE))
  39 +          || purple_xfer_get_type(xfer) != want_type) {
  40 +               xfer = NULL;
  41 +       }
  42 +
  43 +       return xfer;
  44 +}
  45 +
  46  static void
  47  msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
  48  {
  49 @@ -247,7 +274,21 @@ msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
  50
  51         if (slpmsg->offset < real_size)
  52         {
  53 -               if (slpmsg->fp)
  54 +               PurpleXfer *ready_xfer = msn_get_ready_xfer(slplink,
  55 +                                                            slpmsg,
  56 +                                                            PURPLE_XFER_SEND);
  57 +               PurpleXferUiOps *ui_ops = NULL;
  58 +               if (ready_xfer)
  59 +               {
  60 +                       ui_ops = purple_xfer_get_ui_ops(ready_xfer);
  61 +               }
  62 +               if (ui_ops && ui_ops->ui_read) {
  63 +                       guchar *data = NULL;
  64 +                       len = ui_ops->ui_read(ready_xfer, &data, 1202);
  65 +                       msn_message_set_bin_data(msg, data, len);
  66 +                       g_free(data);
  67 +               }
  68 +               else if (slpmsg->fp)
  69                 {
  70                         char data[1202];
  71                         len = fread(data, 1, sizeof(data), slpmsg->fp);
  72 @@ -459,7 +500,9 @@ send_file_cb(MsnSlpCall *slpcall)
  73         xfer = (PurpleXfer *)slpcall->xfer;
  74         purple_xfer_start(slpcall->xfer, -1, NULL, 0);
  75         slpmsg->fp = xfer->dest_fp;
  76 -       if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
  77 +       slpmsg->size = purple_xfer_get_size(xfer);
  78 +       if (! slpmsg->size
  79 +           && g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
  80                 slpmsg->size = st.st_size;
  81         xfer->dest_fp = NULL; /* Disable double fclose() */
  82
  83 @@ -489,6 +532,8 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
  84         const char *data;
  85         guint64 offset;
  86         gsize len;
  87 +       PurpleXfer *ready_xfer;
  88 +       PurpleXferUiOps *ui_ops;
  89
  90         if (purple_debug_is_verbose())
  91                 msn_slpmsg_show(msg);
  92 @@ -569,7 +614,17 @@ msn_slplink_process_msg(MsnSlpLink *slplink, MsnMessage *msg)
  93                 }
  94         }
  95
  96 -       if (slpmsg->fp)
  97 +       ready_xfer = msn_get_ready_xfer(slplink, slpmsg, PURPLE_XFER_RECEIVE);
  98 +       ui_ops = (PurpleXferUiOps *)NULL;
  99 +       if (ready_xfer)
 100 +       {
 101 +               ui_ops = purple_xfer_get_ui_ops(ready_xfer);
 102 +       }
 103 +       if (ui_ops && ui_ops->ui_write)
 104 +       {
 105 +               len = ui_ops->ui_write(ready_xfer, data, len);
 106 +       }
 107 +       else if (slpmsg->fp)
 108         {
 109                 /* fseek(slpmsg->fp, offset, SEEK_SET); */
 110                 len = fwrite(data, 1, len, slpmsg->fp);
 111 @@ -652,7 +707,7 @@ typedef struct
 112  #define MAX_FILE_NAME_LEN 0x226
 113
 114  static gchar *
 115 -gen_context(const char *file_name, const char *file_path)
 116 +gen_context(const char *file_name, const char *file_path, PurpleXfer *xfer)
 117  {
 118         struct stat st;
 119         gsize size = 0;
 120 @@ -666,7 +721,8 @@ gen_context(const char *file_name, const char *file_path)
 121         glong uni_len = 0;
 122         gsize len;
 123
 124 -       if (g_stat(file_path, &st) == 0)
 125 +       size = purple_xfer_get_size(xfer);
 126 +       if (!size && g_stat(file_path, &st) == 0)
 127                 size = st.st_size;
 128
 129         if(!file_name) {
 130 @@ -743,7 +799,7 @@ msn_slplink_request_ft(MsnSlpLink *slplink, PurpleXfer *xfer)
 131
 132         xfer->data = slpcall;
 133
 134 -       context = gen_context(fn, fp);
 135 +       context = gen_context(fn, fp, xfer);
 136
 137         msn_slpcall_invite(slpcall, MSN_FT_GUID, 2, context);
 138