comparison src/protocols/oscar/ft.c @ 3752:b32474e522fa

[gaim-migrate @ 3890] From: "William T. Mahan" <[e-mail]> This patch, against CVS HEAD, fixes three bugs in Oscar File Transfer support. I can split it up further if desired. * Send a null checksum when initiating a file transfer, which fixes "files don't match" warnings produced by some versions of WinAIM; add a compile-time option to actually compute the checksum, which is slow but necessary when sending to some Mac clients. * Don't allow sending files to oneself, because it causes all kinds of subtle problems and it's not useful. * Don't crash when there is an error writing to the output file when receiving. From: "William T. Mahan" <[e-mail]> This patch 2 of 3, which applies on top of the first, adds support for reverse connections for Oscar File Transfer, the lack of which has been the biggest complaint so far. Reverse connections are used by newer AIM clients when there is difficulty verifying the IP of the sender. From: "William T. Mahan" <[e-mail]> This patch 3 of 3, which applies on top of the first 2, removes the alarm() and sigaction() calls that were added by my original FT patch to detect transfer timeouts. Besides apparently not working on Windows, they involved a lot of ugly code to handle a special case. My new approach is to add destructors that can called when SNACs are freed; a timeout is detected when a request SNAC is cleaned up before the transfer is accepted. Although this touches several files, it is more generic than the old method. I tried to implement this in an unintrusive manner, so that there is little preformance penalty for SNACs that do not use destructors. My first two patches should work fine without this. If there are any objections to the third patch, I ask that the first two patches be applied, in which case I will set up a SourceForge page for this one. committer: Tailor Script <[e-mail]>

3751:e25577506dec

		return -1;
	}

	faimdprintf(sess, 2, "faim: get_rend: looks like we're done with a transfer (oft 0x0204)\n");

	debug_printf("wtm: they sent csum %x\n", fh->recvcsum);

	if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILECOMPLETE)) )
		userfunc(sess, NULL, conn, fh->bcookie);

	free(fh);

  struct aim_fileheader_t *fh;

  if (!sess || !conn || !name)
    return -1;

  /* Authenticate whomever connected to our listener by checking
   * that the correct cookie was proivided. */
  if (!(cook = aim_checkcookie(sess, ft->cookie,
				  AIM_COOKIETYPE_OFTSEND))) {
	  return -1;
  }

  if (!(fh = (struct aim_fileheader_t*)calloc(1, sizeof(struct aim_fileheader_t))))
    return -1;

  fh->encrypt     = 0x0000;
  fh->compress    = 0x0000; 
  fh->totfiles    = numfiles;
  fh->filesleft   = numfiles - filesdone;
  fh->totparts    = 0x0001;
  fh->partsleft   = 0x0001;
  fh->totsize     = totsize;
  fh->size        = size;
  fh->modtime     = (int)time(NULL); /* we'll go with current time for now */
  fh->checksum    = 0xffffffff; /* XXX: checksum ! */
  fh->rfcsum      = 0x00000000;
  fh->rfsize      = 0x00000000;
  fh->cretime     = 0x00000000;
  fh->rfcsum      = 0x00000000;
  fh->nrecvd      = 0x00000000; /* always zero initially */

	  char *basename = g_path_get_basename(name);
	  strncpy(fh->name, basename, sizeof(fh->name));
	  g_free(basename);
  }

  memcpy(fh->bcookie, cook->cookie, 8);
  /* Update both headers to be safe. */
  memcpy(&(ft->fh), fh, sizeof(struct aim_fileheader_t));
  memcpy(&(((struct aim_filetransfer_priv *)cook->data)->fh), fh,
		  sizeof(struct aim_fileheader_t));

3752:b32474e522fa

		return -1;
	}

	faimdprintf(sess, 2, "faim: get_rend: looks like we're done with a transfer (oft 0x0204)\n");

	debug_printf("sendfile: receiver sent checksum %x\n", fh->recvcsum);

	if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_GETFILECOMPLETE)) )
		userfunc(sess, NULL, conn, fh->bcookie);

	free(fh);

  struct aim_fileheader_t *fh;

  if (!sess || !conn || !name)
    return -1;

  if (!(fh = (struct aim_fileheader_t*)calloc(1, sizeof(struct aim_fileheader_t))))
    return -1;

#ifdef DUMB_OFT_CHECKSUM
  /* Yes, we are supposed to checksum the whole file before sending, and
   * yes, it's dumb.  This is the only way to get some clients (such as
   * Mac AIM v4.5.163) to successfully complete the transfer.  With
   * the WinAIM clients, we seem to be able to get away with just
   * setting the checksum to zero.
   * -- wtm
   */
  {
    int fd = open(name, O_RDONLY);
    if (fd >= 0) {
       int bytes;
       char buf[1024];
       fh->checksum = 0xffff0000;
       while ((bytes = read(fd, buf, 1024)) > 0) {
         fh->checksum = aim_oft_checksum(buf, bytes, fh->checksum);
       }
    }
    close(fd);
  }
#else
  fh->checksum    = 0x00000000;
#endif

  fh->encrypt     = 0x0000;
  fh->compress    = 0x0000; 
  fh->totfiles    = numfiles;
  fh->filesleft   = numfiles - filesdone;
  fh->totparts    = 0x0001;
  fh->partsleft   = 0x0001;
  fh->totsize     = totsize;
  fh->size        = size;
  fh->modtime     = (int)time(NULL); /* we'll go with current time for now */
  /* fh->checksum set above */
  fh->rfcsum      = 0x00000000;
  fh->rfsize      = 0x00000000;
  fh->cretime     = 0x00000000;
  fh->rfcsum      = 0x00000000;
  fh->nrecvd      = 0x00000000; /* always zero initially */

	  char *basename = g_path_get_basename(name);
	  strncpy(fh->name, basename, sizeof(fh->name));
	  g_free(basename);
  }

  /* XXX we should normally send a null cookie here, and make
   * the receiver fill it in for authentication -- wtm
   */
  memcpy(fh->bcookie, ft->cookie, 8);

  if (!(cook = aim_checkcookie(sess, ft->cookie, AIM_COOKIETYPE_OFTSEND))) {
    return -1;
  }

  /* Update both headers to be safe. */
  memcpy(&(ft->fh), fh, sizeof(struct aim_fileheader_t));
  memcpy(&(((struct aim_filetransfer_priv *)cook->data)->fh), fh,
		  sizeof(struct aim_fileheader_t));