Changeset 3118

Timestamp:

02/06/06 23:45:58 (3 years ago)

Author:

timothy

Message:

Don't reuse the same AsyncSocket?. This lets us reliably reconnect.

Files:

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

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

@@ -296 +296 @@
-- (id) init {
-        if( ( self = [super init] ) ) {
-                _chatConnection = [[AsyncSocket allocWithZone:nil] initWithDelegate:self];
-
-                _serverPort = 6667;
-                _server = @"irc.freenode.net";
@@ -371 +369 @@
-        }
-
-
+
+
+
+
+
+
-        _lastConnectAttempt = [[NSDate allocWithZone:nil] init];
+        [old release];
-
-        [self _willConnect]; // call early so other code has a chance to change our info
@@ -383 +387 @@
-
-        [self performSelector:@selector( _connect ) inThread:_connectionThread];
-
-/*
-// Setup the proxy header with the most current connection address and port.
-        if( _proxy == MVChatConnectionHTTPSProxy || _proxy == MVChatConnectionHTTPProxy ) {
-                NSString *userCombo = [NSString stringWithFormat:@"%@:%@", _proxyUsername, _proxyPassword];
-                NSData *combo = [userCombo dataUsingEncoding:NSASCIIStringEncoding];
-
-                g_free_not_null( _chatConnectionSettings -> proxy_string );
-                if( [combo length] > 1 ) {
-                        NSString *userCombo = [combo base64EncodingWithLineLength:0];
-                        _chatConnectionSettings -> proxy_string = g_strdup_printf( "CONNECT %s:%d HTTP/1.0\r\nProxy-Authorization: Basic %s\r\n\r\n", _chatConnectionSettings -> address, _chatConnectionSettings -> port, [userCombo UTF8String] );
-                } else _chatConnectionSettings -> proxy_string = g_strdup_printf( "CONNECT %s:%d HTTP/1.0\r\n\r\n", _chatConnectionSettings -> address, _chatConnectionSettings -> port );
-
-                g_free_not_null( _chatConnectionSettings -> proxy_string_after );
-                _chatConnectionSettings -> proxy_string_after = NULL;
-        }
-*/
-}
-
@@ -766 +753 @@
-        id old = _localUser;
-        _localUser = nil;
+        [old release];
+
+        old = _chatConnection;
+        _chatConnection = nil;
+        [old setDelegate:nil];
-        [old release];
-