Changeset 3101

Timestamp:

12/30/05 06:05:58 (3 years ago)

Author:

timothy

Message:

• Added DCC send and improved DCC receive.
  

Files:

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

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

@@ -30 +30 @@
-
-@interface MVChatConnection (MVIRCChatConnectionPrivate)
+- (AsyncSocket *) _chatConnection;
-- (void) _readNextMessageFromServer;
-

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

@@ -516 +516 @@
-        [self disconnect];
-
+        [_chatConnection setDelegate:nil];
+
-        [_chatConnection release];
-        [_knownUsers release];
@@ -948 +950 @@
-
-@implementation MVIRCChatConnection (MVIRCChatConnectionPrivate)
+- (AsyncSocket *) _chatConnection {
+        return _chatConnection;
+}
+
-- (void) _connect {
-        [_chatConnection disconnect];
@@ -1475 +1481 @@
-                                NSHost *host = [NSHost hostWithAddress:address];
-
-
+(MVIRCDownloadFileTransfer *)
-                                [transfer _setOriginalFileName:[parameters objectAtIndex:1]];
-                                [transfer _setFinalSize:(unsigned long long)size];

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

@@ -7 +7 @@
-@interface MVIRCUploadFileTransfer : MVUploadFileTransfer {
-        AsyncSocket *_connection;
+        AsyncSocket *_clientConnection;
-        NSThread *_connectionThread;
+        NSFileHandle *_fileHandle;
+        BOOL _fileNameQuoted;
+        BOOL _done;
+        unsigned int _passiveId;
-}
+- (void) _setupAndStart;
+- (void) _sendNextPacket;
+- (void) _finish;
-@end
-
@@ -18 +26 @@
-        NSFileHandle *_fileHandle;
-        BOOL _fileNameQuoted;
+        BOOL _done;
-        unsigned int _passiveId;
-}
-- (void) _setupAndStart;
+- (void) _finish;
-@end

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

@@ -1 +1 @@
-#import <sched.h>
+#import <arpa/inet.h>
-
-#import "MVIRCFileTransfer.h"
@@ -83 +84 @@
-} */
-
-
+
-
-@implementation MVIRCUploadFileTransfer
++ (void) initialize {
+        portRange = NSMakeRange( 1024, 20 );
+}
+
-+ (id) transferWithSourceFile:(NSString *) path toUser:(MVChatUser *) user passively:(BOOL) passive {
-
-
-
-
-
-
-
-
+
+
+
+
-        [ret _setSource:path];
+        [ret _setPassive:passive];
+
+        NSNumber *size = [[[NSFileManager defaultManager] fileAttributesAtPath:[ret source] traverseLink:YES] objectForKey:NSFileSize];
+        [ret _setFinalSize:[size unsignedLongLongValue]];
+
+        NSString *fileName = [[ret source] lastPathComponent];  
+        ret->_fileNameQuoted = ( [fileName rangeOfString:@" "].location != NSNotFound );
+
+        if( passive ) {
+                passiveId++;
+                if( passiveId > 1000 )
+                        passiveId = 1;
+                ret->_passiveId = passiveId;
+        } else {
+                [ret _setupAndStart];
+        }
-
-        return [ret autorelease];
+}
+
+- (void) release {
+        if( ( [self retainCount] - 1 ) == 1 )
+                [(MVIRCChatConnection *)[[self user] connection] _removeFileTransfer:self];
+        [super release];
+}
+
+- (void) dealloc {
+        id old = _fileHandle;
+        _fileHandle = nil;
+        [old closeFile];
+        [old release];
+
+        _connectionThread = nil;
+
+        [super dealloc];
-}
-
-- (void) cancel {
-        [self _setStatus:MVFileTransferStoppedStatus];
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        _connection = nil;
+        [old setDelegate:nil];
+        [old release];
+
+        old = _clientConnection;
+        _clientConnection = nil;
+        [old setDelegate:nil];
+        [old release];
+
+        _done = YES;
+}
+
+- (oneway void) _dccRunloop {
+        NSAutoreleasePool *pool = [[NSAutoreleasePool allocWithZone:nil] init];
+        [self retain];
+
+        _connectionThread = [NSThread currentThread];
+        [NSThread prepareForInterThreadMessages];
+        [NSThread setThreadPriority:0.75];
+
+        BOOL active = YES;
+        while( active && ! _done ) {
+                NSDate *timeout = [[NSDate allocWithZone:nil] initWithTimeIntervalSinceNow:5.];
+                active = [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:timeout];
+                [timeout release];
+        }
+
+        _connectionThread = nil;
+
+        [self _finish];
+        [self release];
+
+        [pool release];
-}
-@end
@@ -110 +302 @@
-
-@implementation MVIRCDownloadFileTransfer
+- (void) release {
+        if( ( [self retainCount] - 1 ) == 1 )
+                [(MVIRCChatConnection *)[[self user] connection] _removeFileTransfer:self];
+        [super release];
+}
+
-- (void) dealloc {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        _connectionThread = nil;
-        _fileHandle = nil;
-
-        [super dealloc];
@@ -129 +323 @@
-        if( _fileNameQuoted ) [[self user] sendSubcodeRequest:@"DCC" withArguments:[NSString stringWithFormat:@"REJECT \"%@\"", [self originalFileName]]];
-        else [[self user] sendSubcodeRequest:@"DCC" withArguments:[NSString stringWithFormat:@"REJECT %@", [self originalFileName]]];
+        [self cancel];
-}
-
-- (void) cancel {
-        [self _setStatus:MVFileTransferStoppedStatus];
-
-
+
+
+
+
+
+
+
+
+
-}
-
@@ -147 +349 @@
-                                else [[self user] sendSubcodeRequest:@"DCC" withArguments:[NSString stringWithFormat:@"RESUME %@ 0 %llu %lu", [self originalFileName], [size unsignedLongLongValue], _passiveId]];
-                        } else {
-l
-l
+h
+h
-                        }
-                        return; // we need to wait until we get an ACCEPT reply
@@ -160 +362 @@
-
-- (void) socket:(AsyncSocket *) sock willDisconnectWithError:(NSError *) error {
-
+download 
-        [self _setStatus:MVFileTransferErrorStatus];
-}
-
-- (void) socketDidDisconnect:(AsyncSocket *) sock {
-
+&& [self status] != MVFileTransferStoppedStatus 
-                [self _setStatus:MVFileTransferErrorStatus];
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -184 +389 @@
-                packet = [self finalSize] - progress;
-        [_connection readDataToLength:packet withTimeout:-1. tag:0];
+
+        // now that we are connected deregister with the connection
+        // do this last incase the connection is the last thing retaining us
+        [(MVIRCChatConnection *)[[self user] connection] _removeFileTransfer:self];
-}
-
@@ -208 +417 @@
-                [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVFileTransferFinishedNotification object:self];
-                [_connection disconnect];
+                _done = YES;
-        }
-}
@@ -221 +431 @@
-        if( ! fileExists ) return;
-
-[_fileHandle release]
+id old = _fileHandle
-        _fileHandle = [[NSFileHandle fileHandleForWritingAtPath:[self destination]] retain];
+        [old release];
+
-        if( ! _fileHandle ) return;
-        [_fileHandle truncateFileAtOffset:[self startOffset]];
-
-[_connection release]
+old = _connection
-        _connection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
+        [old release];
-
-        if( ! _connectionThread ) {
@@ -245 +458 @@
-}
-
+- (void) _finish {
+        id old = _connection;
+        _connection = nil;
+        [old setDelegate:nil];
+        [old release];
+
+        _done = YES;
+}
+
-- (oneway void) _dccRunloop {
-        NSAutoreleasePool *pool = [[NSAutoreleasePool allocWithZone:nil] init];
+        [self retain];
-
-        _connectionThread = [NSThread currentThread];
@@ -253 +476 @@
-
-        BOOL active = YES;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        [pool release];