Changeset 3079

Timestamp:

12/24/05 18:56:59 (3 years ago)

Author:

timothy

Message:

• Connecting to IRC will now send the PASS, NICK and USER commands to initialize the connection.
  
• Cleaned up the parsing code.
  
• The trailing argument will be added to the parameters array as an NSData to allow other code to parse the encoding (important for per room/chat encodings and CTCP where non-printable chars are used.) The other parameters are made to NSStrings with the connection encoding.
  

Files:

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

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

@@ -27 +27 @@
-@interface MVChatConnection (MVIRCChatConnectionPrivate)
-- (void) _readNextMessageFromServer;
+- (void) _handleCommand:(id) command parameters:(NSArray *) parameters fromSender:(NSString *) sender username:(NSString *) user host:(NSString *) host;
-
-+ (const char *) _flattenedIRCStringForMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) enc andChatFormat:(MVChatMessageFormat) format;

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

@@ -1424 +1424 @@
-        [_chatConnection writeData:data withTimeout:-1. tag:0];
-        [data release];
+
+        [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:raw, @"message", [NSNumber numberWithBool:YES], @"outbound", nil]];
-}
-
@@ -1589 +1591 @@
-
-- (void) socket:(AsyncSocket *) sock didConnectToHost:(NSString *) host port:(UInt16) port {
+        if( [[self password] length] ) [self sendRawMessageWithFormat:@"PASS %@", [self password]];
+        [self sendRawMessageWithFormat:@"NICK %@", [self nickname]];
+        [self sendRawMessageWithFormat:@"USER %@ %@ %@ :%@", [self username], [[NSHost currentHost] name], [self server], [self realName]];
-        [self _didConnect];
-        [self _readNextMessageFromServer];
-}
-
-- (void) _readNextMessageFromServer {
-        static NSData *delimeter = nil;
-        if( ! delimeter ) delimeter = [[NSData allocWithZone:nil] initWithBytes:"\x0D\x0A" length:2];
-        [_chatConnection readDataToData:delimeter withTimeout:-1. tag:0];
-}
-
@@ -1609 +1608 @@
-        char *command = NULL;
-        char *currentParameter = NULL;
-
+
+
+
+
+
+
+
+
-
-        if( len <= 2 || len > 512 )
-                goto end; // bad message
-
+#define checkAndMarkIfDone() if( *line == '\r' || *line == '\f' || *line == '\0' ) done = YES
+#define consumeWhitespace() while( *line == ' ' && ! done ) line++
+#define notEndOfLine() *line != '\r' && *line != '\f' && *line != '\0' && ! done
+
-        BOOL done = NO;
-*line != '\r' && ! done
+notEndOfLine()
-                if( *line == ':' ) {
-                        // prefix: ':' <sender> [ '!' <user> ] [ '@' <host> ] ' ' { ' ' }
-                        sender = ++line;
-*line != '\r'
-if( *line == '\r' ) done = YES
+notEndOfLine()
+checkAndMarkIfDone()
-
-                        if( *line == '!' ) {
-                                *line++ = '\0';
-                                user = line;
-*line != '\r' && *line != ' ' && *line != '@' && ! done
-if( *line == '\r' ) done = YES
+notEndOfLine() && *line != ' ' && *line != '@'
+checkAndMarkIfDone()
-                                if( *line != '@' ) *line = '\0';
-                        }
@@ -1633 +1643 @@
-                                *line++ = '\0';
-                                host = line;
-*line != '\r' && *line != ' ' && ! done
-if( *line == '\r' ) done = YES
+notEndOfLine() && *line != ' '
+checkAndMarkIfDone()
-                                *line = '\0';
-                        }
-
-
-
-
-
+
+
-                }
-
-*line != '\r' && ! done
+notEndOfLine()
-                        // command: <letter> { <letter> } | <number> <number> <number>
-                        // letter: 'a' ... 'z' | 'A' ... 'Z'
-                        // number: '0' ... '9'
-                        command = line;
-
-
-
-
-
+
+
+
-                }
-
-NSString *
-*line != '\r' && ! done
+id 
+notEndOfLine()
-                        // params: [ ':' <trailing data> | <letter> { <letter> } ] [ ' ' { ' ' } ] [ <params> ]
-                        currentParameter = NULL;
@@ -1663 +1669 @@
-                        if( *line == ':' ) {
-                                currentParameter = ++line;
-*line != '\r' && ! done
+notEndOfLine()
-                                *line = '\0';
-                                done = YES;
+                                param = [[NSData allocWithZone:nil] initWithBytes:currentParameter length:(line - currentParameter)];
-                        } else {
-                                currentParameter = line;
-*line != '\r' && *line != ' ' && ! done
-if( *line == '\r' ) done = YES
+notEndOfLine() && *line != ' '
+checkAndMarkIfDone()
-                                *line++ = '\0';
+                                param = [[NSString allocWithZone:nil] initWithBytes:currentParameter encoding:[self encoding]];
-                        }
-
-                        if( currentParameter ) 
-                                param = [NSString stringWithBytes:currentParameter encoding:[self encoding]];
-                        if( param ) [parameters addObject:param];
-
-
+
+
+
-                }
-        }
-
+#undef checkAndMarkIfDone()
+#undef consumeWhitespace()
+#undef notEndOfLine()
+
-end:
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        [rawString release];
-
+        [senderString release];
+        [usernameString release];
+        [hostString release];
+        [commandObject release];
-        [parameters release];
+
-        [self _readNextMessageFromServer];
+}
+
+- (void) _readNextMessageFromServer {
+        static NSData *delimeter = nil;
+        if( ! delimeter ) delimeter = [[NSData allocWithZone:nil] initWithBytes:"\x0D\x0A" length:2];
+        [_chatConnection readDataToData:delimeter withTimeout:-1. tag:0];
+}
+
+- (void) _handleCommand:(id) command parameters:(NSArray *) parameters fromSender:(NSString *) sender username:(NSString *) user host:(NSString *) host {
+        NSLog(@"%@ %@ %@ %@ %@", sender, user, host, command, [parameters description] );
-}
-