Changeset 3103

Timestamp:

12/31/05 04:31:44 (3 years ago)

Author:

timothy

Message:

DCC support complete. More complete than Irssi.

• 64 bit support, allows file transfers over 4 GB. (Irssi does this, but not the rest.)
  
• Turbo mode if the other client supports it. (No acknowledgment packets are sent or needed.)
  
• Send ahead, sends data without waiting to the acknowledgment packets. (Fast sends.)
  

Files:

• branches/cocoa-networking/Chat Core/MVIRCChatConnection.m (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVIRCFileTransfer.h (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVIRCFileTransfer.m (modified) (14 diffs)

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

@@ -1480 +1480 @@
-                                NSHost *host = [NSHost hostWithAddress:address];
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-
-                                [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;

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

@@ -7 +7 @@
-@interface MVIRCUploadFileTransfer : MVUploadFileTransfer {
-        AsyncSocket *_connection;
-clien
+accep
-        NSThread *_connectionThread;
-        NSFileHandle *_fileHandle;
@@ -26 +26 @@
-@interface MVIRCDownloadFileTransfer : MVDownloadFileTransfer {
-        AsyncSocket *_connection;
+        AsyncSocket *_acceptConnection;
-        NSThread *_connectionThread;
-        NSFileHandle *_fileHandle;

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

@@ -110 +110 @@
-                        passiveId = 1;
-                ret->_passiveId = passiveId;
+
+                if( ret->_fileNameQuoted ) [user sendSubcodeRequest:@"DCC" withArguments:[NSString stringWithFormat:@"SEND \"%@\" 16843009 0 %llu %luT", fileName, [ret finalSize], passiveId]];
+                else [user sendSubcodeRequest:@"DCC" withArguments:[NSString stringWithFormat:@"SEND %@ 16843009 0 %llu %luT", fileName, [ret finalSize], passiveId]];
-        } else {
-                [ret _setupAndStart];
@@ -124 +127 @@
-
-- (void) dealloc {
-        NSLog(@"u/l dealloc" );
-        id old = _fileHandle;
-        _fileHandle = nil;
@@ -151 +153 @@
-
-- (void) socket:(AsyncSocket *) sock didAcceptNewSocket:(AsyncSocket *) newSocket {
-lientConnection ) _clientC
+onnection ) _c
-        else [newSocket disconnect];
-}
@@ -178 +180 @@
-
-        [self _sendNextPacket];
-lientC
+
-
-        // now that we are connected deregister with the connection
@@ -202 +204 @@
-
-        [self _setTransfered:bytes];
-lientC
+
-
-        if( bytes == ( [self finalSize] & 0xffffffff ) ) {
@@ -232 +234 @@
-        while( ! _connectionThread ) sched_yield();
-
-
+
+
-}
-
-- (void) _waitForConnection {
-
-
+
-
-        unsigned int port = portRange.location;
-        BOOL success = NO;
-        while( ! success ) {
-c
+acceptC
-                        success = YES;
-                        break;
-                } else {
-c
+acceptC
-                        if( ++port > NSMaxRange( portRange ) )
-                                port = 0; // just use a random port since the user defined range is in use
@@ -256 +258 @@
-                if( [address rangeOfString:@"."].location != NSNotFound )
-                        address = [NSNumber numberWithUnsignedLong:ntohl( inet_addr( [address UTF8String] ) )];
-c
+acceptC
-
-                NSString *fileName = [[self source] lastPathComponent];
@@ -264 +266 @@
-}
-
+- (void) _connect {
+        _connection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
+
+        if( ! [_connection connectToHost:[[self host] address] onPort:[self port] error:NULL] ) {
+                NSLog(@"can't connect to DCC" );
+                return;
+        }
+}
+
-- (void) _sendNextPacket {
-        NSData *data = [_fileHandle readDataOfLength:DCCPacketSize];
-lientC
+
-        else _doneSending = YES;
-}
@@ -273 +284 @@
-        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _finish ) object:nil];       
-
-c
-c
+acceptC
+acceptC
-        [old setDelegate:nil];
-        [old disconnect];
-        [old release];
-
-lientC
-lientC
+
+
-        [old setDelegate:nil];
-        [old disconnect];
@@ -331 +342 @@
-
-- (void) dealloc {
-        NSLog(@"d/l dealloc" );
-        id old = _fileHandle;
-        _fileHandle = nil;
@@ -385 +395 @@
-#pragma mark -
-
+- (void) socket:(AsyncSocket *) sock didAcceptNewSocket:(AsyncSocket *) newSocket {
+        if( ! _connection ) _connection = [newSocket retain];
+        else [newSocket disconnect];
+}
+
-- (void) socket:(AsyncSocket *) sock willDisconnectWithError:(NSError *) error {
-        NSLog(@"download DCC willDisconnectWithError: %@", error );
@@ -460 +475 @@
-        while( ! _connectionThread ) sched_yield();
-
-
+
+
-}
-
@@ -472 +488 @@
-}
-
+- (void) _waitForConnection {
+        _acceptConnection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
+
+        unsigned int port = portRange.location;
+        BOOL success = NO;
+        while( ! success ) {
+                if( [_acceptConnection acceptOnPort:port error:NULL] ) {
+                        success = YES;
+                        break;
+                } else {
+                        [_acceptConnection disconnect];
+                        if( ++port > NSMaxRange( portRange ) )
+                                port = 0; // just use a random port since the user defined range is in use
+                }
+        }
+
+        if( success ) {
+                id address = [[(MVIRCChatConnection *)[[self user] connection] _chatConnection] localHost];
+                if( [address rangeOfString:@"."].location != NSNotFound )
+                        address = [NSNumber numberWithUnsignedLong:ntohl( inet_addr( [address UTF8String] ) )];
+                [self _setPort:[_acceptConnection localPort]];
+
+                if( _fileNameQuoted ) [[self user] sendSubcodeRequest:@"DCC" withArguments:[NSString stringWithFormat:@"SEND \"%@\" %@ %hu %llu %lu", [self originalFileName], address, [self port], [self finalSize], [self _passiveIdentifier]]];
+                else [[self user] sendSubcodeRequest:@"DCC" withArguments:[NSString stringWithFormat:@"SEND %@ %@ %hu %llu %lu", [self originalFileName], address, [self port], [self finalSize], [self _passiveIdentifier]]];
+        } else _done = YES;
+}
+
-- (void) _finish {
-        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _finish ) object:nil];       
@@ -477 +520 @@
-        id old = _connection;
-        _connection = nil;
+        [old setDelegate:nil];
+        [old disconnect];
+        [old release];
+
+        old = _acceptConnection;
+        _acceptConnection = nil;
-        [old setDelegate:nil];
-        [old disconnect];