Changeset 116

Timestamp:

08/20/07 20:41:56 (1 year ago)

Author:

eric

Message:

Revmoved key timeout thread and replaced it with a NSObject performSelector:withObject:afterDelay. No need to addKeysWithoutInteraction in a seperate thread.

Files:

• branches/eric/AgentController.m (modified) (6 diffs)
• branches/eric/Controller.m (modified) (1 diff)
• branches/eric/Libs/SSHAgent.m (modified) (1 diff)
• branches/eric/Libs/SSHKeychain.h (modified) (2 diffs)
• branches/eric/Libs/SSHKeychain.m (modified) (7 diffs)

branches/eric/AgentController.m

@@ -143 +143 @@
-                if((status & 1) && ([agent isRunning]))
-                {
-
-
+
-                }
-        }       
@@ -222 +221 @@
-
-                [allKeysOnAgentLock unlock];
-
-
-
+
+
-        }
-}
@@ -281 +279 @@
-                allKeysOnAgent = YES;
-                [allKeysOnAgentLock unlock];
+                
+                if ([[NSUserDefaults standardUserDefaults] integerForKey:KeyTimeoutString] > 0)
+                {
+                        // Self firing timer with reset
+                        [[self class] cancelPreviousPerformRequestsWithTarget: self ];
+                        [self performSelector: @selector(removeKeysFromAgent:) 
+                                           withObject: nil
+                                           afterDelay: [[NSUserDefaults standardUserDefaults] integerForKey:KeyTimeoutString] * 60.00 ];
+                        
+                }
-                
-                [[Controller sharedController] setStatus:YES];
@@ -336 +344 @@
-                        && (![keychain addingKeys]) && (status & 1) && ([agent isRunning]))
-                {
-
-
+
-                }
-
@@ -444 +451 @@
-        if([agent isRunning])
-        {
+        
-                [NSThread detachNewThreadSelector:@selector(addKeysToAgentInNewThread)
-                                                        toTarget:self withObject:nil];
@@ -465 +473 @@
-                               inMainThread:YES];
-        }
-
-        [pool release];
-}
-
-- (void)addKeysToAgentWithoutInteractionInNewThread
-{
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
-        [keychain addKeysToAgentWithInteraction:NO];
-
-        [pool release];

branches/eric/Controller.m

@@ -39 +39 @@
-
-        conn = [NSConnection defaultConnection];
-
+
-        [conn runInNewThread];
-        [conn removeRunLoop:[NSRunLoop currentRunLoop]];

branches/eric/Libs/SSHAgent.m

@@ -639 +639 @@
-                [self setKeysOnAgent:nil];
-
-
+ 
-                [self setKeysOnAgent:[[SSHAgent currentAgent] currentKeysOnAgent]];
-}

branches/eric/Libs/SSHKeychain.h

@@ -10 +10 @@
-        BOOL addingKeys;
-        
-        int lastScheduled;
-
-        /* Locks */
-        NSLock *keychainLock;
-        NSLock *addingKeysLock;
-        NSLock *lastScheduledLock;
-}
-
@@ -40 +37 @@
-- (BOOL)addKeysToAgent;
-- (BOOL)addKeysToAgentWithInteraction:(BOOL)interaction;
-- (void)removeKeysAfterTimeout:(id)object;
-- (BOOL)removeKeysFromAgent;
-

branches/eric/Libs/SSHKeychain.m

@@ -4 +4 @@
-#import "SSHKey.h"
-#import "SSHTool.h"
+#import "SSHAgent.h"
-
-#include <unistd.h>
@@ -33 +34 @@
-        keychainLock = [[NSLock alloc] init];
-        addingKeysLock = [[NSLock alloc] init];
-        lastScheduledLock = [[NSLock alloc] init];
-        lastScheduled = -1;
-        
-        [self resetToKeysWithPaths:paths];
@@ -51 +50 @@
-        [keychainLock release];
-        [addingKeysLock release];
-        [lastScheduledLock release];
-        [agentSocketPath release];
-        
@@ -109 +107 @@
-}
-
-- (int) lastScheduled
-{
-        [lastScheduledLock lock];
-        int returnInt = lastScheduled;
-        [lastScheduledLock unlock];
-
-        return returnInt;
-}
-
-- (void) setLastScheduled:(int) scheduledTime
-{
-        [lastScheduledLock lock];
-        lastScheduled = scheduledTime;
-        [lastScheduledLock unlock];
-}
-
-/* Returns the SSHKey at Index nr. */
@@ -208 +191 @@
-                return YES;
-
-agentSocketPath || ![[NSFileManager defaultManager] isReadableFileAtPath:agentSocketPath
+[[SSHAgent currentAgent] isRunning
-                return NO;
-        
@@ -247 +230 @@
-        }
-        
-        if ([[NSUserDefaults standardUserDefaults] integerForKey:KeyTimeoutString] > 0)
-        {
-                int timeScheduled = time(nil);
-                [self setLastScheduled:timeScheduled];
-                
-                [NSThread detachNewThreadSelector:@selector(removeKeysAfterTimeout:) toTarget:self 
-                                                                withObject:[NSNumber numberWithInt:timeScheduled]];
-        }
-
-        [[NSNotificationCenter defaultCenter]  postNotificationName:@"AgentFilled" object:nil];
-        
-        [self setAddingKeys:NO];
-        return YES;
-}
-
-/* Remove all keys from the ssh-agent from a NSTimer object. */
-- (void)removeKeysAfterTimeout:(id)object
-{
-        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-        int timeScheduled = [object intValue];
-        
-        sleep([[NSUserDefaults standardUserDefaults] integerForKey:KeyTimeoutString] * 60);
-        
-        /* If the time this timeout was scheduled is still the most recent, go ahead and remove the keys */
-        if (timeScheduled == [self lastScheduled]) 
-                [self removeKeysFromAgent];
-        
-        [pool release];
-}
-
@@ -282 +241 @@
-        SSHTool *theTool = [SSHTool toolWithName:@"ssh-add"];
-
-
-
-
+
-                return NO;
-