comparison src/protocols/oscar/ft.c @ 3960:7ba5f2e13ee8

[gaim-migrate @ 4142] Small oscar corrections. I don't think anything is really affected. committer: Tailor Script <[e-mail]>

3959:9c2d8579ff3e

#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/utsname.h> /* for aim_directim_initiate */
#include <arpa/inet.h> /* for inet_ntoa */
#endif

/* XXX - I really don't think this should include gaim.h */
#include "gaim.h"

#ifdef _WIN32
#include "win32dep.h"
#endif

	memcpy(newoft->hdr.rend.magic, "OFT2", 4);
	newoft->hdr.rend.hdrlen = aim_bstream_curpos(&newoft->data);

	aim_tx_enqueue(sess, newoft);

	/*
	 * Throw away the resource fork, in case we are receiving from a Mac.
	 */
	if (ft->fh.rfsize) {
		char *buf = malloc(ft->fh.rfsize);
		if (!buf)
			return -1;
		aim_recv(conn->fd, buf, ft->fh.rfsize);
	}

	if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_SENDFILEFILEREQ)) == NULL)
		return 1;

	{
		char *cur;

/* 
 * These were originally described by Josh Myer:
 * http://www.geocrawler.com/archives/3/896/2000/9/0/4291064/
 * XXX this doesn't actualy work yet
 * -- wtm
 */
static int handlehdr_sendfile_resume(aim_session_t *sess, aim_conn_t *conn, aim_bstream_t *bs) {
	aim_frame_t *newoft;
	aim_msgcookie_t *cook;

#endif
	fh->encrypt = 0x0000;
	fh->compress = 0x0000;
	fh->totfiles = numfiles;
	fh->filesleft = numfiles - filesdone;
	fh->totparts = 0x0001;
	fh->partsleft = 0x0001;
	fh->totsize = totsize; /* set to 0x0002 sending Mac resource forks */
	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;

3960:7ba5f2e13ee8

#include <netdb.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/utsname.h> /* for aim_directim_initiate */
#include <arpa/inet.h> /* for inet_ntoa */
#define G_DIR_SEPARATOR '/'
#endif

#ifdef _WIN32
#include "win32dep.h"
#endif

	memcpy(newoft->hdr.rend.magic, "OFT2", 4);
	newoft->hdr.rend.hdrlen = aim_bstream_curpos(&newoft->data);

	aim_tx_enqueue(sess, newoft);

	if ( (userfunc = aim_callhandler(sess, conn, AIM_CB_FAM_OFT, AIM_CB_OFT_SENDFILEFILEREQ)) == NULL)
		return 1;

	{
		char *cur;

/* 
 * These were originally described by Josh Myer:
 * http://www.geocrawler.com/archives/3/896/2000/9/0/4291064/
 * XXX this doesn't actually work yet
 * -- wtm
 */
static int handlehdr_sendfile_resume(aim_session_t *sess, aim_conn_t *conn, aim_bstream_t *bs) {
	aim_frame_t *newoft;
	aim_msgcookie_t *cook;

#endif
	fh->encrypt = 0x0000;
	fh->compress = 0x0000;
	fh->totfiles = numfiles;
	fh->filesleft = numfiles - filesdone;
	fh->totparts = 0x0001; /* set to 0x0002 sending Mac resource forks */
	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;