Do not delay port checking if port forwarding is disabled

This commit is contained in:
Eric Petit 2008-09-06 15:07:09 +00:00
parent b121a59172
commit ede407ee0e
3 changed files with 6 additions and 5 deletions

View File

@ -44,7 +44,7 @@ typedef enum
NSTimer * fTimer; NSTimer * fTimer;
} }
- (id) initForPort: (int) portNumber withDelegate: (id) delegate; - (id) initForPort: (int) portNumber delay: (BOOL) delay withDelegate: (id) delegate;
- (void) cancelProbe; - (void) cancelProbe;
- (void) callBackWithStatus: (port_status_t) status; - (void) callBackWithStatus: (port_status_t) status;

View File

@ -30,7 +30,7 @@
@implementation PortChecker @implementation PortChecker
- (id) initForPort: (int) portNumber withDelegate: (id) delegate - (id) initForPort: (int) portNumber delay: (BOOL) delay withDelegate: (id) delegate
{ {
if ((self = [super init])) if ((self = [super init]))
{ {
@ -39,8 +39,8 @@
fPortNumber = portNumber; fPortNumber = portNumber;
fStatus = PORT_STATUS_CHECKING; fStatus = PORT_STATUS_CHECKING;
fTimer = [NSTimer scheduledTimerWithTimeInterval: CHECK_FIRE target: self selector: @selector(startProbe) fTimer = [NSTimer scheduledTimerWithTimeInterval: (delay ? CHECK_FIRE : 0.1) target: self
userInfo: nil repeats: NO]; selector: @selector(startProbe) userInfo: nil repeats: NO];
} }
return self; return self;

View File

@ -365,7 +365,8 @@ tr_handle * fHandle;
[fPortChecker cancelProbe]; [fPortChecker cancelProbe];
[fPortChecker release]; [fPortChecker release];
} }
fPortChecker = [[PortChecker alloc] initForPort: fPeerPort withDelegate: self]; fPortChecker = [[PortChecker alloc] initForPort: fPeerPort
delay: tr_sessionIsPortForwardingEnabled(fHandle) withDelegate: self];
} }
} }