Changeset 3084

Timestamp:

12/26/05 19:29:26 (3 years ago)

Author:

timothy

Message:

• Redid the IRC tokenizer to remove the need for NSString initWithBytes to do a strlen. This also cleans up the code a little and removed the mutation of the data AsyncSocket? hands us. I'm l33t. :}
  
• Parsing of CTCP requests and replies. Nothing is done with these yet except an NSLog. (Applied the new non-mutation parsing logic here also.)
  

Files:

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

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

@@ -29 +29 @@
-- (void) _readNextMessageFromServer;
-
+- (void) _handleCTCP:(NSMutableData *) data asRequest:(BOOL) request fromSender:(MVChatUser *) sender forRoom:(MVChatRoom *) room;
+        
-+ (NSData *) _flattenedIRCDataForMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) enc andChatFormat:(MVChatMessageFormat) format;
-- (void) _sendMessage:(NSAttributedString *) message withEncoding:(NSStringEncoding) encoding toTarget:(NSString *) target asAction:(BOOL) action;

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

@@ -979 +979 @@
-        }
-
+        // IRC messages are always lines of characters terminated with a CR-LF
+        // (Carriage Return - Line Feed) pair, and these messages SHALL NOT
+        // exceed 512 characters in length, counting all characters including
+        // the trailing CR-LF. Thus, there are 510 characters maximum allowed
+        // for the command and its parameters.
+
+        if( [data length] > 510 ) [data setLength:510];
-        [data appendBytes:"\x0D\x0A" length:2];
-
@@ -1150 +1157 @@
-- (void) socket:(AsyncSocket *) sock didReadData:(NSData *) data withTag:(long) tag {
-        NSString *rawString = [[NSString allocWithZone:nil] initWithData:data encoding:[self encoding]];
-har *line = (char *)[(NSMutableData *)data mutableB
+onst char *line = (const char *)[data b
-        unsigned int len = [data length];
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-        NSMutableArray *parameters = [[NSMutableArray allocWithZone:nil] initWithCapacity:15];
@@ -1166 +1177 @@
-                goto end; // bad message
-
-*line == '\r' || *line == '\f' || *line == '\0'
-
-*line != '\r' && *line != '\f' && *line != '\0'
+line == end
+line != end && 
+line != end
-
-        BOOL done = NO;
@@ -1176 +1187 @@
-                        sender = ++line;
-                        while( notEndOfLine() && *line != ' ' && *line != '!' && *line != '@' ) line++;
+                        senderLength = (line - sender);
-                        checkAndMarkIfDone();
-
-
-
-
+
+
-                                while( notEndOfLine() && *line != ' ' && *line != '@' ) line++;
+                                userLength = (line - host);
-                                checkAndMarkIfDone();
-                                if( *line != '@' ) *line = '\0';
-                        }
-
-
-
-
+
+
-                                while( notEndOfLine() && *line != ' ' ) line++;
+                                hostLength = (line - host);
-                                checkAndMarkIfDone();
-                                *line = '\0';
-                        }
-
-*line++ = '\0'
+if( ! done ) line++
-                        consumeWhitespace();
-                }
@@ -1204 +1214 @@
-                        command = line;
-                        while( notEndOfLine() && *line != ' ' ) line++;
-
+
+
+
+
-                        consumeWhitespace();
-                }
-
-                id param = nil;
-                while( notEndOfLine() ) {
-                        // params: [ ':' <trailing data> | <letter> { <letter> } ] [ ' ' { ' ' } ] [ <params> ]
-
-
+onst char *c
+id 
-                        if( *line == ':' ) {
-                                currentParameter = ++line;
-
-
+
-                                done = YES;
-                                param = [[NSData allocWithZone:nil] initWithBytes:currentParameter length:(line - currentParameter)];
-                        } else {
-                                currentParameter = line;
-                                while( notEndOfLine() && *line != ' ' ) line++;
+                                param = [[NSString allocWithZone:nil] initWithBytes:currentParameter length:(line - currentParameter) encoding:[self encoding]];
-                                checkAndMarkIfDone();
-
-
+
-                        }
-
@@ -1239 +1249 @@
-
-end:
-
-
+&& commandLength 
+length:commandLength 
-                NSString *selectorString = [[NSString allocWithZone:nil] initWithFormat:@"_handle%@WithParameters:fromSender:", [commandString capitalizedString]];
-                SEL selector = NSSelectorFromString( selectorString );
@@ -1248 +1258 @@
-                if( [self respondsToSelector:selector] ) {
-                        NSString *senderString = nil;
-
+length:senderLength 
-
-                        MVChatUser *chatUser = nil;
-
+&& userLength 
-                                chatUser = [self chatUserWithUniqueIdentifier:senderString];
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
@@ -1442 +1461 @@
-                }
-
-
+
+
+
+
+
+
+
-                if( [[self chatRoomNamePrefixes] characterIsMember:[targetName characterAtIndex:0]] ) {
-                        MVChatRoom *room = [self joinedChatRoomWithName:targetName];
-
-
-
+
+
-                } else {
-
-
-
+
+
-                }
-        }
@@ -1466 +1489 @@
-                }
-
-
+
+
+
+
-                if( [[self chatRoomNamePrefixes] characterIsMember:[targetName characterAtIndex:0]] ) {
-                        MVChatRoom *room = [self joinedChatRoomWithName:targetName];
-[sender status] != MVChatUserAwayStatus ) [sender _setStatus:MVChatUserAvailableStatus
-
+ctcp ) [self _handleCTCP:msgData asRequest:NO fromSender:sender forRoom:room
+else 
-                } else {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                                [msg release];
-                        }
-                }
-        }
+}
+
+- (void) _handleCTCP:(NSMutableData *) data asRequest:(BOOL) request fromSender:(MVChatUser *) sender forRoom:(MVChatRoom *) room {
+        NSMutableArray *parameters = [[NSMutableArray allocWithZone:nil] initWithCapacity:15];
+        const char *line = (const char *)[data bytes] + 1; // skip the \001 char
+        const char *end = line + [data length] - 2; // minus the first and last \001 char
+        BOOL done = NO;
+
+        while( line != end && ! done ) {
+                // params: [ ':' <trailing data> | <letter> { <letter> } ] [ ' ' { ' ' } ] [ <params> ]
+                const char *currentParameter = NULL;
+                id param = nil;
+                if( *line == ':' ) {
+                        currentParameter = ++line;
+                        param = [[NSMutableData allocWithZone:nil] initWithBytes:currentParameter length:(end - currentParameter)];
+                        done = YES;
+                } else {
+                        currentParameter = line;
+                        while( line != end && *line != ' ' ) line++;
+                        param = [[NSString allocWithZone:nil] initWithBytes:currentParameter length:(line - currentParameter) encoding:[self encoding]];
+                        if( line == end ) done = YES;
+                        else line++;
+                }
+
+                if( param ) [parameters addObject:param];
+                [param release];
+
+                while( *line == ' ' && line != end && ! done ) line++;
+        }
+
+        NSLog(@"ctcp %@ %d %@", sender, request, [parameters description] );
-}
-