DLog.h DLog.m @@ -63,7 +63,7 @@ NSString *FiSHAvoidEncCommand = @"disableEnc"; { if (self = [super init]) { -// NSLog(@"Loading FiSHy."); + DLog(@"Loading FiSHy."); keyExchanger_ = [[FiSHKeyExchanger alloc] initWithDelegate:self]; urlToConnectionCache_ = [[NSMutableDictionary alloc] init]; @@ -166,7 +166,7 @@ NSString *FiSHAvoidEncCommand = @"disableEnc"; [msgAttributes setObject:[NSNumber numberWithInt:FiSHCypherTextCut] forKey:@"FiSHyResult"]; break; default: - NSLog(@"Unexpected/unknown blowfish result."); + DLog(@"Unexpected/unknown blowfish result."); } } @@ -226,7 +226,7 @@ bail: { if (![aView isKindOfClass:NSClassFromString(@"JVDirectChatPanel")]) { - NSLog(@"Unexpected view class encountered."); + DLog(@"Unexpected view class encountered."); return; } // It's now safe to typecast view, to prevent compiler-warnings later. @@ -237,7 +237,7 @@ bail: // The following checks for attributes regarding messages from the local user. if ([message senderIsLocalUser]) { - if ([[[message attributes] objectForKey:@"shouldEncrypt"] boolValue] && [encPrefs_ preferenceForService:nil account:targetName] == FiSHEncPrefAvoidEncrypted) + if ([[message objectForKey:@"shouldEncrypt"] boolValue] && [encPrefs_ preferenceForService:nil account:targetName] == FiSHEncPrefAvoidEncrypted) { NSTextStorage *body = [message body]; [body appendAttributedString:[[[NSAttributedString alloc] initWithString:FiSHEncryptedMessageMarker @@ -249,7 +249,7 @@ bail: } else { // The following checks for attributes regarding messages not from the local user. - BOOL decrypted = [[[message attributes] objectForKey:@"decrypted"] boolValue]; + BOOL decrypted = [[message objectForKey:@"decrypted"] boolValue]; FiSHEncPrefKey encPref = [encPrefs_ preferenceForService:nil account:targetName]; NSString *errorMsg = nil; if (decrypted && encPref == FiSHEncPrefAvoidEncrypted) @@ -276,7 +276,7 @@ bail: { if (![aView isKindOfClass:NSClassFromString(@"JVDirectChatPanel")]) { - NSLog(@"Unexpected view class encountered."); + DLog(@"Unexpected view class encountered."); return; } // It's now safe to typecast view, to prevent compiler-warnings later. @@ -288,18 +288,10 @@ bail: // TODO: Handle service. if ([encPrefs_ preferenceForService:nil account:targetName] == FiSHEncPrefPreferEncrypted) { - NSMutableDictionary *attributes = [[message attributes] mutableCopy]; - if (!attributes) - attributes = [NSMutableDictionary dictionary]; - [attributes setObject:[NSNumber numberWithBool:YES] forKey:@"shouldEncrypt"]; - [message setAttributes:attributes]; + [message setObject:[NSNumber numberWithBool:YES] forKey:@"shouldEncrypt"]; } else if ([encPrefs_ preferenceForService:nil account:targetName] == FiSHEncPrefAvoidEncrypted) { - NSMutableDictionary *attributes = [[message attributes] mutableCopy]; - if (!attributes) - attributes = [NSMutableDictionary dictionary]; - [attributes setObject:[NSNumber numberWithBool:YES] forKey:@"sendUnencrypted"]; - [message setAttributes:attributes]; + [message setObject:[NSNumber numberWithBool:YES] forKey:@"sendUnencrypted"]; } } @@ -321,7 +313,7 @@ bail: // So check first for the correct class-membership before proceeding. if (![aView isKindOfClass:NSClassFromString(@"JVDirectChatPanel")]) { - NSLog(@"Unexpected view class encountered."); + DLog(@"Unexpected view class encountered."); return NO; } // It's now safe to typecast view, to prevent compiler-warnings later. @@ -336,7 +328,7 @@ bail: else { // TODO: Put out notice to user. - NSLog(@"No argument provided to /keyx, aborting."); + DLog(@"No argument provided to /keyx, aborting."); return NO; } } @@ -344,7 +336,7 @@ bail: if ([argumentString hasPrefix:@"#"] || [argumentString hasPrefix:@"&"]) { // TODO: Put out notice to user. - NSLog(@"Key exchange is only supported for nicknames, not for channels, aborting."); + DLog(@"Key exchange is only supported for nicknames, not for channels, aborting."); return NO; } @@ -362,7 +354,7 @@ bail: if (!argumentString || [argumentString length] <= 0) { // TODO: Put out notice to user. - NSLog(@"No arguments provided to /setkey, aborting."); + DLog(@"No arguments provided to /setkey, aborting."); return NO; } @@ -371,7 +363,7 @@ bail: // So check first for the correct class-membership before proceeding. if (![aView isKindOfClass:NSClassFromString(@"JVDirectChatPanel")]) { - NSLog(@"Unexpected view class encountered."); + DLog(@"Unexpected view class encountered."); return NO; } // It's now safe to typecast view, to prevent compiler-warnings later. @@ -390,7 +382,7 @@ bail: account = [[view target] name]; else { // TODO: Put out notice to user. - NSLog(@"SetKey expects exactly 2 arguments, aborting."); + DLog(@"SetKey expects exactly 2 arguments, aborting."); return NO; } secret = [argumentList objectAtIndex:0]; @@ -401,7 +393,7 @@ bail: } else { // TODO: Put out notice to user. - NSLog(@"SetKey expects exactly 2 arguments, aborting."); + DLog(@"SetKey expects exactly 2 arguments, aborting."); return NO; } @@ -425,14 +417,14 @@ bail: { if (![aView isKindOfClass:NSClassFromString(@"JVDirectChatPanel")]) { - NSLog(@"Unexpected view class encountered."); + DLog(@"Unexpected view class encountered."); return NO; } // It's now safe to typecast view, to prevent compiler-warnings later. JVDirectChatPanel *view = (JVDirectChatPanel *)aView; JVMutableChatMessage *msg = [[[NSClassFromString(@"JVMutableChatMessage") alloc] initWithText:arguments sender:[connection localUser]] autorelease]; - [msg setAttributes:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] forKey:@"sendUnencrypted"]]; + [msg setObject:[NSNumber numberWithBool:YES] forKey:@"sendUnencrypted"]; [view echoSentMessageToDisplay:msg]; [view sendMessage:msg]; @@ -443,7 +435,7 @@ bail: { if (![aView isKindOfClass:NSClassFromString(@"JVDirectChatPanel")]) { - NSLog(@"Unexpected view class encountered."); + DLog(@"Unexpected view class encountered."); return NO; } // It's now safe to typecast view, to prevent compiler-warnings later. @@ -460,7 +452,7 @@ bail: } else { // TODO: Put out notice to user. - NSLog(@"Command expects exactly 1 argument"); + DLog(@"Command expects exactly 1 argument"); return NO; } @@ -491,7 +483,7 @@ bail: // So check first for the correct class-membership before proceeding. if (![aView isKindOfClass:NSClassFromString(@"JVDirectChatPanel")]) { - NSLog(@"Unexpected view class encountered."); + DLog(@"Unexpected view class encountered."); return NO; } // It's now safe to typecast view, to prevent compiler-warnings later. FiSHController.m @@ -40,6 +40,8 @@ const NSString *FiSHKeyExchangeInfoRemoveOldTempKeyPairTimerKey = @"FiSHKeyExcha - (NSDictionary *)temporaryKeyExchangeInfosForNickname:(NSString *)nickname onConnection:(id)connection; - (void)removeTemporaryKeyExchangeInfosForNickName:(NSString *)nickname onConnection:(id)connection; +- (void)handleKeyExchangeTimeoutForNickname:(NSString *)nickname onConnection:(id)connection; + - (void)handleFiSHKeyExchangeRequestFrom:(NSString *)nickname on:(id)connection withRemotePublicKeyData:(NSString *)remotePublicKeyData; - (void)handleFiSHKeyExchangeResponseFrom:(NSString *)nickname on:(id)connection withRemotePublicKeyData:(NSString *)remotePublicKeyData; @end @@ -112,7 +114,7 @@ const NSString *FiSHKeyExchangeInfoRemoveOldTempKeyPairTimerKey = @"FiSHKeyExcha if ([message hasStringPrefix:HCKFiSHKeyExchangeRequest encoding:NSASCIIStringEncoding]) { // The notice is interpreted as a FiSH key exchange request, when its message body starts with "DH1080_INIT ". - NSLog(@"Got remote FiSH DH1080 key exchange request."); + DLog(@"Got remote FiSH DH1080 key exchange request."); NSString *remotePublicKey = [[NSString alloc] initWithData:[message subDataFromIndex:[HCKFiSHKeyExchangeRequest length]] encoding:NSASCIIStringEncoding]; @@ -124,7 +126,7 @@ const NSString *FiSHKeyExchangeInfoRemoveOldTempKeyPairTimerKey = @"FiSHKeyExcha } else if ([message hasStringPrefix:HCKFiSHKeyExchangeResponse encoding:NSASCIIStringEncoding]) { // The notice is interpreted as a FiSH key exchange response, when its message body starts with "DH1080_FINISH ". - NSLog(@"Got FiSH DH1080 key exchange response."); + DLog(@"Got FiSH DH1080 key exchange response."); NSString *remotePublicKey = [[NSString alloc] initWithData:[message subDataFromIndex:[HCKFiSHKeyExchangeResponse length]] encoding:NSASCIIStringEncoding]; @@ -154,10 +156,10 @@ const NSString *FiSHKeyExchangeInfoRemoveOldTempKeyPairTimerKey = @"FiSHKeyExcha } // Build an invocation, which deletes the to be added key pair. - NSMethodSignature *methodSig = [self methodSignatureForSelector:@selector(removeTemporaryKeyExchangeInfosForNickName:onConnection:)]; + NSMethodSignature *methodSig = [self methodSignatureForSelector:@selector(handleKeyExchangeTimeoutForNickname:onConnection:)]; NSInvocation *removeOldTempKeyExchangeInfoInvocation = [NSInvocation invocationWithMethodSignature:methodSig]; [removeOldTempKeyExchangeInfoInvocation setTarget:self]; - [removeOldTempKeyExchangeInfoInvocation setSelector:@selector(removeTemporaryKeyExchangeInfosForNickName:onConnection:)]; + [removeOldTempKeyExchangeInfoInvocation setSelector:@selector(handleKeyExchangeTimeoutForNickname:onConnection:)]; [removeOldTempKeyExchangeInfoInvocation setArgument:&nickname atIndex:2]; [removeOldTempKeyExchangeInfoInvocation setArgument:&connection atIndex:3]; @@ -186,7 +188,7 @@ const NSString *FiSHKeyExchangeInfoRemoveOldTempKeyPairTimerKey = @"FiSHKeyExcha - (void)removeTemporaryKeyExchangeInfosForNickName:(NSString *)nickname onConnection:(id)connection; { - NSLog(@"Removing temporary key exchange info for %@ on %@", nickname, connection); + DLog(@"Removing temporary key exchange info for %@ on %@", nickname, connection); [temporaryKeyExchangeInfosLock_ lock]; // First, invalidate the timer set up to remove this tempo key pair after some time has passed. @@ -196,6 +198,15 @@ const NSString *FiSHKeyExchangeInfoRemoveOldTempKeyPairTimerKey = @"FiSHKeyExcha [temporaryKeyExchangeInfosLock_ unlock]; } +- (void)handleKeyExchangeTimeoutForNickname:(NSString *)nickname onConnection:(id)connection; +{ + [self removeTemporaryKeyExchangeInfosForNickName:nickname onConnection:connection]; + + [delegate_ outputStatusInformation:NSLocalizedString(@"Timed out waiting for key-exchange reply.", "Timed out waiting for key-exchange reply") + forContext:nickname + on:connection]; +} + - (void)handleFiSHKeyExchangeRequestFrom:(NSString *)nickname on:(id)connection withRemotePublicKeyData:(NSString *)remotePublicKeyData; { [delegate_ outputStatusInformation:NSLocalizedString(@"Received key exchange request.", "Received key exchange request") FiSHKeyExchanger.mm @@ -142,7 +142,7 @@ FiSHSecretStore *sharedSecretStore = nil; if (status != noErr) { // Something went wrong looking for/chaning/adding an entry in Keychain, just bail out. - NSLog(@"Can't access Keychain."); + DLog(@"Can't access Keychain."); } return (status == noErr); FiSHSecretStore.m @@ -23,6 +23,7 @@ D4A6B3840B8FB881001816EB /* FiSHEncryptionPrefs.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A6B3830B8FB881001816EB /* FiSHEncryptionPrefs.m */; }; D4AFBC4A0B8A2F070086B38A /* NSData+FiSHyExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AFBC490B8A2F070086B38A /* NSData+FiSHyExtensions.m */; }; D4BD4B080B8CD64A0016D3B9 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = D4BD4B070B8CD64A0016D3B9 /* LICENSE.txt */; }; + D4EF67C10B91CC900018A60E /* DLog.m in Sources */ = {isa = PBXBuildFile; fileRef = D4EF67C00B91CC900018A60E /* DLog.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -108,6 +109,8 @@ D4D8D8980B824922000FA9F8 /* dh1080.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = dh1080.cpp; sourceTree = "<group>"; }; D4E281520B8D06330095A792 /* buildDMG.pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; path = buildDMG.pl; sourceTree = "<group>"; }; D4E2816C0B8D0E0F0095A792 /* READ ME.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "READ ME.rtf"; sourceTree = "<group>"; }; + D4EF67BF0B91CC900018A60E /* DLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DLog.h; sourceTree = "<group>"; }; + D4EF67C00B91CC900018A60E /* DLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DLog.m; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -213,8 +216,10 @@ 32C88E010371C26100C91783 /* Other Sources */ = { isa = PBXGroup; children = ( - D4D8D8850B8248C0000FA9F8 /* Dirt */, 32DBCF630370AF2F00C91783 /* FiSHy_Prefix.pch */, + D4EF67BF0B91CC900018A60E /* DLog.h */, + D4EF67C00B91CC900018A60E /* DLog.m */, + D4D8D8850B8248C0000FA9F8 /* Dirt */, ); name = "Other Sources"; sourceTree = "<group>"; @@ -437,6 +442,7 @@ D4423EA00B84BDFA0039DCB9 /* misc.cpp in Sources */, D4AFBC4A0B8A2F070086B38A /* NSData+FiSHyExtensions.m in Sources */, D4A6B3840B8FB881001816EB /* FiSHEncryptionPrefs.m in Sources */, + D4EF67C10B91CC900018A60E /* DLog.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -522,6 +528,7 @@ "$(inherited)", "${COLLOQUY_SOURCE_FOLDER}/**", ); + OTHER_CFLAGS = "-DDEBUG"; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SYMROOT = "${COLLOQUY_SOURCE_FOLDER}/build"; @@ -576,7 +583,7 @@ D496F46F0B80D2D00015B1F2 /* Development (Universal) */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_VERSION = 0.3.0a1; + APPLICATION_VERSION = 0.3.0b1; COLLOQUY_SOURCE_FOLDER = ../colloquy; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -584,6 +591,7 @@ "$(inherited)", "${COLLOQUY_SOURCE_FOLDER}/**", ); + OTHER_CFLAGS = "-DDEBUG"; PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; SYMROOT = "${COLLOQUY_SOURCE_FOLDER}/build"; FiSHy.xcodeproj/project.pbxproj @@ -20,6 +20,7 @@ #ifdef __OBJC__ #import <Cocoa/Cocoa.h> + #import "DLog.h" #endif #ifndef MAC_OS_X_VERSION_10_5 FiSHy_Prefix.pch 1c53128630e51c87dedf31211863210e27b72d05 henningkiel henningkiel http://github.com/hennk/fishy/commit/a2fea2de0f285de5c3eb975ad4d4c6537764b455 a2fea2de0f285de5c3eb975ad4d4c6537764b455 2007-02-25T09:01:05-08:00 2007-02-25T09:01:05-08:00 Fixed a crash when a second /keyx was sent to a nick for which another /keyx was already pending. We now delete any prior keyx-infos before starting a new one. Now prints a message when a /keyx timed out. Uses DLog instead of NSLog. Logging to Console is disabled per default. To enable it, set the environment variable DEBUG to YES, or compile the sources with -DDEBUG. Updated to use new Colloquy features introduced with the second version of the patch for ticket 1015. 60cd15c6974b5ce48d06c4a2c09224160be7e746 henningkiel henningkiel