Mercurial > pidgin
view src/protocols/icq/queue.c @ 3752:b32474e522fa
[gaim-migrate @ 3890]
From: "William T. Mahan" <wtm2@duke.edu>
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" <wtm2@duke.edu>
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" <wtm2@duke.edu>
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 <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sat, 19 Oct 2002 05:22:30 +0000 |
| parents | f0a2a9afdb77 |
| children |
line wrap: on
line source
/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* * $Id: queue.c 2509 2001-10-13 00:06:18Z warmenhoven $ * * Copyright (C) 1998-2001, Denis V. Dmitrienko <denis@null.net> and * Bill Soudan <soudan@kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ #include <stdlib.h> #include "icqlib.h" #include "queue.h" #include "udp.h" void icq_UDPQueueNew(icq_Link *icqlink) { icqlink->d->icq_UDPQueue = icq_ListNew(); icqlink->icq_UDPExpireInterval = 15; /* expire interval = 15 sec */ } void icq_UDPQueuePut(icq_Link *icqlink, icq_Packet *p) { icq_UDPQueueItem *ptr = (icq_UDPQueueItem*)malloc(sizeof(icq_UDPQueueItem)); #ifdef QUEUE_DEBUG printf("icq_UDPQueuePut(seq=0x%04X, cmd=0x%04X)\n", icq_PacketReadUDPOutSeq1(p), icq_PacketReadUDPOutCmd(p)); #endif ptr->attempts = 1; ptr->timeout = icq_TimeoutNew(icqlink->icq_UDPExpireInterval, (icq_TimeoutHandler)icq_UDPQueueItemResend, ptr); ptr->timeout->single_shot = 0; ptr->pack = p; ptr->icqlink = icqlink; #ifdef QUEUE_DEBUG printf("enqueuing queueitem %p\n", ptr); #endif icq_ListEnqueue(icqlink->d->icq_UDPQueue, ptr); } void _icq_UDPQueueItemFree(void *p) { icq_UDPQueueItem *pitem=(icq_UDPQueueItem *)p; #ifdef QUEUE_DEBUG printf("_icq_UDPQueueItemFree(%p)\n", p); #endif if (pitem->pack) icq_PacketDelete(pitem->pack); if (pitem->timeout) icq_TimeoutDelete(pitem->timeout); free(p); } /* Frees the queue and dispose it */ void icq_UDPQueueDelete(icq_Link *icqlink) { #ifdef QUEUE_DEBUG printf("icq_UDPQueueDelete\n"); #endif if(icqlink->d->icq_UDPQueue) { icq_ListDelete(icqlink->d->icq_UDPQueue, _icq_UDPQueueItemFree); icqlink->d->icq_UDPQueue = 0; } } /* Only frees the queue */ void icq_UDPQueueFree(icq_Link *icqlink) { #ifdef QUEUE_DEBUG printf("icq_UDPQueueFree\n"); #endif if(icqlink->d->icq_UDPQueue) icq_ListFree(icqlink->d->icq_UDPQueue, _icq_UDPQueueItemFree); } int icq_UDPQueueFindSeq(void *p, va_list data) { WORD seq=va_arg(data, int); return icq_PacketReadUDPOutSeq1(((icq_UDPQueueItem *)p)->pack) == seq; } void icq_UDPQueueDelSeq(icq_Link *icqlink, WORD seq) { icq_UDPQueueItem *ptr; #ifdef QUEUE_DEBUG printf("icq_UDPQueueDelSeq(seq=0x%04X", seq); #endif ptr = icq_ListTraverse(icqlink->d->icq_UDPQueue, icq_UDPQueueFindSeq, seq); if(ptr) { #ifdef QUEUE_DEBUG printf(", cmd=0x%04X",icq_PacketReadUDPOutCmd(ptr->pack)); #endif icq_ListRemove(icqlink->d->icq_UDPQueue, ptr); _icq_UDPQueueItemFree(ptr); } #ifdef QUEUE_DEBUG printf(")\n"); #endif } void icq_UDPQueueItemResend(icq_UDPQueueItem *p) { p->attempts++; if (p->attempts > 6) { icq_Disconnect(p->icqlink); invoke_callback(p->icqlink, icq_Disconnected)(p->icqlink); return; } icq_UDPSockWriteDirect(p->icqlink, p->pack); }
