Changeset 3102

Timestamp:

12/31/05 03:01:21 (3 years ago)

Author:

timothy

Message:

DCC fixes. Resume support when sending.

Files:

• branches/cocoa-networking/Chat Core/MVIRCChatConnection.m (modified) (4 diffs)
• branches/cocoa-networking/Chat Core/MVIRCFileTransfer.h (modified) (3 diffs)
• branches/cocoa-networking/Chat Core/MVIRCFileTransfer.m (modified) (19 diffs)

branches/cocoa-networking/Chat Core/MVIRCChatConnection.m

@@ -1465 +1465 @@
-                        NSString *msg = [[NSString allocWithZone:nil] initWithData:arguments encoding:[self encoding]];
-                        NSArray *parameters = [msg componentsSeparatedByString:@" "];
-                        [msg release];
-
-                        if( [parameters count] >= 5 && [[parameters objectAtIndex:0] caseInsensitiveCompare:@"SEND"] == NSOrderedSame ) {
@@ -1482 +1481 @@
-
-                                MVIRCDownloadFileTransfer *transfer = [(MVIRCDownloadFileTransfer *)[MVIRCDownloadFileTransfer allocWithZone:nil] initWithUser:sender];
+                                if( port == 0 && [parameters count] >= 6 ) {
+                                        BOOL turbo = ( [[parameters objectAtIndex:5] rangeOfString:@"T"].location != NSNotFound );
+                                        [transfer _setTurbo:turbo];
+                                        [transfer _setPassiveIdentifier:[[parameters objectAtIndex:5] intValue]];
+                                        [transfer _setPassive:YES];
+                                } else if( [parameters count] >= 6 ) {
+                                        [transfer _setTurbo:[[parameters objectAtIndex:5] isEqualToString:@"T"]];
+                                }
+
-                                [transfer _setOriginalFileName:[parameters objectAtIndex:1]];
-                                [transfer _setFinalSize:(unsigned long long)size];
-                                [transfer _setHost:host];
-                                [transfer _setPort:port];
+
-                                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVDownloadFileTransferOfferNotification object:transfer];
+
-                                [self _addFileTransfer:transfer];
-                                [transfer release];
-                        } else if( [parameters count] >= 4 && [[parameters objectAtIndex:0] caseInsensitiveCompare:@"ACCEPT"] == NSOrderedSame ) {
+                                BOOL passive = NO;
-                                long long size = 0;
-                                unsigned int port = [[parameters objectAtIndex:2] intValue];
@@ -1495 +1506 @@
-                                [scanner scanLongLong:&size];
-
+                                if( [parameters count] >= 5 ) {
+                                        passive = YES;
+                                        port = [[parameters objectAtIndex:4] intValue];
+                                }
+
-                                @synchronized( _fileTransfers ) {
-                                        NSEnumerator *enumerator = [_fileTransfers objectEnumerator];
-                                        MVFileTransfer *transfer = nil;
-                                        while( ( transfer = [enumerator nextObject] ) ) {
-
+
+
-                                                        [transfer _setTransfered:(unsigned long long)size];
-                                                        [transfer _setStartOffset:(unsigned long long)size];
@@ -1506 +1523 @@
-                                        }
-                                }
+                        } else if( [parameters count] >= 4 && [[parameters objectAtIndex:0] caseInsensitiveCompare:@"RESUME"] == NSOrderedSame ) {
+                                BOOL passive = NO;
+                                long long size = 0;
+                                unsigned int port = [[parameters objectAtIndex:2] intValue];
+                                NSScanner *scanner = [NSScanner scannerWithString:[parameters objectAtIndex:3]];
+                                [scanner scanLongLong:&size];
+
+                                if( [parameters count] >= 5 ) {
+                                        passive = YES;
+                                        port = [[parameters objectAtIndex:4] intValue];
+                                }
+
+                                @synchronized( _fileTransfers ) {
+                                        NSEnumerator *enumerator = [_fileTransfers objectEnumerator];
+                                        MVFileTransfer *transfer = nil;
+                                        while( ( transfer = [enumerator nextObject] ) ) {
+                                                if( [transfer isUpload] && [transfer isPassive] == passive && [[transfer user] isEqualToChatUser:sender] &&
+                                                        ( ! passive ? [transfer port] == port : [(id)transfer _passiveIdentifier] == port ) ) {
+                                                        [transfer _setTransfered:(unsigned long long)size];
+                                                        [transfer _setStartOffset:(unsigned long long)size];
+                                                        [sender sendSubcodeRequest:@"DCC ACCEPT" withArguments:[msg substringFromIndex:7]];
+                                                }
+                                        }
+                                }
-                        }
+
+                        [msg release];
-                } else if( [command caseInsensitiveCompare:@"CLIENTINFO"] == NSOrderedSame ) {
-                        // make this extnesible later with a plugin registration method

branches/cocoa-networking/Chat Core/MVIRCFileTransfer.h

@@ -11 +11 @@
-        NSFileHandle *_fileHandle;
-        BOOL _fileNameQuoted;
+        BOOL _readData;
+        BOOL _doneSending;
-        BOOL _done;
-        unsigned int _passiveId;
@@ -17 +19 @@
-- (void) _sendNextPacket;
-- (void) _finish;
+- (unsigned int) _passiveIdentifier;
-@end
-
@@ -27 +30 @@
-        BOOL _fileNameQuoted;
-        BOOL _done;
+        BOOL _turbo;
-        unsigned int _passiveId;
-}
-- (void) _setupAndStart;
-- (void) _finish;
+- (void) _setTurbo:(BOOL) turbo;
+- (void) _setPassiveIdentifier:(unsigned int) identifier;
+- (unsigned int) _passiveIdentifier;
-@end

branches/cocoa-networking/Chat Core/MVIRCFileTransfer.m

@@ -124 +124 @@
-
-- (void) dealloc {
+        NSLog(@"u/l dealloc" );
-        id old = _fileHandle;
-        _fileHandle = nil;
@@ -137 +138 @@
-        [self _setStatus:MVFileTransferStoppedStatus];
-
-[self performSelector:@selector( _finish ) inThread:_connectionThread];
+_done = YES; // the thread will disconnect when it ends
-
-        id old = _fileHandle;
@@ -156 +157 @@
-- (void) socket:(AsyncSocket *) sock willDisconnectWithError:(NSError *) error {
-        NSLog(@"upload DCC willDisconnectWithError: %@", error );
-
+
+
-}
-
@@ -168 +170 @@
-        [old release];
-
-[self _finish]
+_done = YES
-}
-
@@ -174 +176 @@
-        [self _setStatus:MVFileTransferNormalStatus];
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVFileTransferStartedNotification object:self];
+
-        [self _sendNextPacket];
+        [_clientConnection readDataToLength:4 withTimeout:-1. tag:0];
-
-        // now that we are connected deregister with the connection
@@ -182 +186 @@
-
-- (void) socket:(AsyncSocket *) sock didWriteDataWithTag:(long) tag {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
-- (void) socket:(AsyncSocket *) sock didReadData:(NSData *) data withTag:(long) tag {
-
+
+
+
+
+
+
-                [self _setStatus:MVFileTransferDoneStatus];
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVFileTransferFinishedNotification object:self];
-
-
+
+
+
+
+
-}
-
@@ -200 +217 @@
-
-- (void) _setupAndStart {
+        if( _connectionThread ) return;
+
-        BOOL directory = NO;
-        BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:[self source] isDirectory:&directory];
-        if( directory || ! fileExists ) return;
-
-id old = _fileHandle
+[_fileHandle release]
-        _fileHandle = [[NSFileHandle fileHandleForReadingAtPath:[self source]] retain];
-        [old release];
-
-        if( ! _fileHandle ) return;
-        [_fileHandle seekToFileOffset:[self startOffset]];
-
-
+
+
+
+
+
+
+
+
+
-        _connection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
-
-
-
-
-
-
-
-
-
-
-
-
+
-        unsigned int port = portRange.location;
-        BOOL success = NO;
@@ -245 +259 @@
-
-                NSString *fileName = [[self source] lastPathComponent];
-
-
-
+ T
+ T
+ else _done = YES;
-}
-
-- (void) _sendNextPacket {
-        NSData *data = [_fileHandle readDataOfLength:DCCPacketSize];
-
-
-
-
-
-
-
+
+
-}
-
-- (void) _finish {
+        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _finish ) object:nil];       
+
-        id old = _connection;
-        _connection = nil;
-        [old setDelegate:nil];
+        [old disconnect];
-        [old release];
-
@@ -270 +282 @@
-        _clientConnection = nil;
-        [old setDelegate:nil];
+        [old disconnect];
-        [old release];
-
@@ -290 +303 @@
-        }
-
-        _connectionThread = nil;
-
-        [self _finish];
-        [self release];
-
+        _connectionThread = nil;
+
-        [pool release];
+}
+
+- (unsigned int) _passiveIdentifier {
+        return _passiveId;
+}
+
+- (void) _setStartOffset:(unsigned long long) startOffset {
+        [_fileHandle seekToFileOffset:startOffset];
+        [super _setStartOffset:startOffset];
-}
-@end
@@ -309 +331 @@
-
-- (void) dealloc {
+        NSLog(@"d/l dealloc" );
-        id old = _fileHandle;
-        _fileHandle = nil;
@@ -329 +352 @@
-        [self _setStatus:MVFileTransferStoppedStatus];
-
-[self performSelector:@selector( _finish ) inThread:_connectionThread];
+_done = YES; // the thread will disconnect when it ends
-
-        id old = _fileHandle;
-        _fileHandle = nil;
+        [old synchronizeFile];
-        [old closeFile];
-        [old release];
@@ -363 +387 @@
-- (void) socket:(AsyncSocket *) sock willDisconnectWithError:(NSError *) error {
-        NSLog(@"download DCC willDisconnectWithError: %@", error );
-
+
+
-}
-
@@ -384 +409 @@
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVFileTransferStartedNotification object:self];
-
-
-
-
-
-
+
-
-        // now that we are connected deregister with the connection
@@ -399 +420 @@
-        [self _setTransfered:progress];
-
-        // dcc only supports a 2 GB limit with these acknowledgment packets, we will acknowledge
-        // that we have all the bytes but keep reading if the file is over 2 GB
-        unsigned long progressToSend = htonl( progress & 0xffffffff );
-        NSData *length = [[NSData allocWithZone:nil] initWithBytes:&progressToSend length:4];
-        [_connection writeData:length withTimeout:-1 tag:0];
-        [length release];
-
-        [_fileHandle writeData:data];
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                [self _setStatus:MVFileTransferDoneStatus];
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVFileTransferFinishedNotification object:self];
-
+AfterWriting
-                _done = YES;
-
+ else [_connection readDataWithTimeout:-1. tag:0];
-}
-
@@ -424 +442 @@
-
-- (void) _setupAndStart {
+        if( _connectionThread ) return;
+
-        BOOL directory = NO;
-        BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:[self destination] isDirectory:&directory];
@@ -431 +451 @@
-        if( ! fileExists ) return;
-
-id old = _fileHandle
+[_fileHandle release]
-        _fileHandle = [[NSFileHandle fileHandleForWritingAtPath:[self destination]] retain];
-        [old release];
-
-        if( ! _fileHandle ) return;
-        [_fileHandle truncateFileAtOffset:[self startOffset]];
-
-
+
+
+
+
+
+
+
+
-        _connection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
-
-
-
-
-
-
-
-
-
-
-
-
+
-        if( ! [_connection connectToHost:[[self host] address] onPort:[self port] error:NULL] ) {
-                NSLog(@"can't connect to DCC" );
@@ -459 +473 @@
-
-- (void) _finish {
+        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _finish ) object:nil];       
+
-        id old = _connection;
-        _connection = nil;
-        [old setDelegate:nil];
+        [old disconnect];
-        [old release];
-
@@ -482 +499 @@
-        }
-
-        _connectionThread = nil;
-
-        [self _finish];
-        [self release];
-
+        _connectionThread = nil;
+
-        [pool release];
-}
+
+- (void) _setTurbo:(BOOL) turbo {
+        _turbo = turbo;
+}
+
+- (void) _setPassiveIdentifier:(unsigned int) identifier {
+        _passiveId = identifier;
+}
+
+- (unsigned int) _passiveIdentifier {
+        return _passiveId;
+}
-@end