Changeset 4203

Timestamp:

Dec 18, 2007, 8:02:49 PM (14 years ago)

Author:

livings124

Message:

use the Transmission website for checking port status; stop previous port check before starting a new one

Location:

trunk/macosx

Files:

• PortChecker.h (modified) (3 diffs)
• PortChecker.m (modified) (5 diffs)
• PrefsController.h (modified) (1 diff)
• PrefsController.m (modified) (4 diffs)

trunk/macosx/PortChecker.h

@@ -25 +25 @@
 #import <Cocoa/Cocoa.h>
 
-typedef enum { PORT_STATUS_OPEN, PORT_STATUS_STEALTH, PORT_STATUS_CLOSED, PORT_STATUS_ERROR } port_status_t;
+typedef enum
+{
+    PORT_STATUS_OPEN,
+    PORT_STATUS_CLOSED,
+    PORT_STATUS_ERROR
+} port_status_t;
 
 @interface PortChecker : NSObject
@@ -31 +36 @@
     id              fDelegate;
     port_status_t   fStatus;
-
+    
+    NSURLConnection * fConnection;
     NSMutableData   * fPortProbeData;
 }
@@ -37 +43 @@
 - (id) initWithDelegate: (id) delegate;
 - (void) probePort: (int) portNumber;
+- (void) endProbe;
+
 - (void) callBackWithStatus: (port_status_t) status;
 - (port_status_t) status;

trunk/macosx/PortChecker.m

@@ -24 +24 @@
 
 #import "PortChecker.h"
+#import "NSApplicationAdditions.h"
 
 @implementation PortChecker
@@ -37 +38 @@
 }
 
+- (void) dealloc
+{
+    [fPortProbeData release];
+    [fConnection release];
+    [super dealloc];
+}
+
 - (port_status_t) status
 {
@@ -45 +53 @@
 {
     NSURLRequest * portProbeRequest = [NSURLRequest requestWithURL: [NSURL URLWithString:
-                                [NSString stringWithFormat: @"https://www.grc.com/x/portprobe=%d", portNumber]]
-                                cachePolicy: NSURLRequestReloadIgnoringCacheData timeoutInterval: 15.0];
+                [NSString stringWithFormat: @"http://transmission.m0k.org/PortCheck.php?port=%d", portNumber]] cachePolicy:
+                [NSApp isOnLeopardOrBetter] ? NSURLRequestReloadIgnoringLocalAndRemoteCacheData : NSURLRequestReloadIgnoringCacheData
+                timeoutInterval: 15.0];
     
-    if ([NSURLConnection connectionWithRequest: portProbeRequest delegate: self])
+    
+    if ((fConnection = [[NSURLConnection alloc] initWithRequest: portProbeRequest delegate: self]))
         fPortProbeData = [[NSMutableData data] retain];
     else
@@ -55 +65 @@
         [self callBackWithStatus: PORT_STATUS_ERROR];
     }
+}
+
+- (void) endProbe
+{
+    [fConnection cancel];
 }
 
@@ -81 +96 @@
     NSLog(@"Unable to get port status: connection failed (%@)", [error localizedDescription]);
     [self callBackWithStatus: PORT_STATUS_ERROR];
-    [fPortProbeData release];
 }
 
 - (void) connectionDidFinishLoading: (NSURLConnection *) connection
 {
-    NSXMLDocument * shieldsUpProbe = [[NSXMLDocument alloc] initWithData: fPortProbeData
-                                        options: NSXMLDocumentTidyHTML error: nil];
+    NSString * probeString = [[NSString alloc] initWithData: fPortProbeData encoding: NSASCIIStringEncoding];
     
-    if (shieldsUpProbe)
-    {
-        NSArray * nodes = [shieldsUpProbe nodesForXPath: @"/html/body/center/table[3]/tr/td[2]" error: nil];
-        if ([nodes count] != 1)
-        {
-            NSArray * title = [shieldsUpProbe nodesForXPath: @"/html/head/title" error: nil];
-            // This may happen when we probe twice too quickly
-            if ([title count] != 1 || ![[[title objectAtIndex: 0] stringValue] isEqualToString:
-                                                                    @"NanoProbe System Already In Use"])
-            {
-                NSLog(@"Unable to get port status: invalid (outdated) XPath expression");
-                [[shieldsUpProbe XMLData] writeToFile: @"/tmp/shieldsUpProbe.html" atomically: YES];
-                [self callBackWithStatus: PORT_STATUS_ERROR];
-            }
-        }
-        else
-        {
-            NSString * portStatus = [[[[nodes objectAtIndex: 0] stringValue] stringByTrimmingCharactersInSet:
-                                                [[NSCharacterSet letterCharacterSet] invertedSet]] lowercaseString];
-            
-            if ([portStatus isEqualToString: @"open"])
-                [self callBackWithStatus: PORT_STATUS_OPEN];
-            else if ([portStatus isEqualToString: @"stealth"])
-                [self callBackWithStatus: PORT_STATUS_STEALTH];
-            else if ([portStatus isEqualToString: @"closed"])
-                [self callBackWithStatus: PORT_STATUS_CLOSED];
-            else
-            {
-                NSLog(@"Unable to get port status: unknown port state");
-                [self callBackWithStatus: PORT_STATUS_ERROR];
-            }
-        }
-        [shieldsUpProbe release];
-    }
+    port_status_t status;
+    if ([probeString isEqualToString: @"0"])
+        status = PORT_STATUS_OPEN;
+    else if ([probeString isEqualToString: @"1"])
+        status = PORT_STATUS_CLOSED;
     else
-    {
-        NSLog(@"Unable to get port status: failed to create xml document");
-        [self callBackWithStatus: PORT_STATUS_ERROR];
-    }
-
-    [fPortProbeData release];
+        status = PORT_STATUS_ERROR;
+    
+    [self callBackWithStatus: status];
+    
+    [probeString release];
 }
 

trunk/macosx/PrefsController.h

@@ -47 +47 @@
     IBOutlet NSTextField    * fUploadField, * fDownloadField,
                             * fSpeedLimitUploadField, * fSpeedLimitDownloadField;
-
+    
+    PortChecker                     * fPortChecker;
     IBOutlet NSTextField            * fPortField, * fPortStatusField;
     IBOutlet NSButton               * fNatCheck;

trunk/macosx/PrefsController.m

@@ -229 +229 @@
 - (void) updatePortStatus
 {
+#warning look into
     tr_handle_status * stat = tr_handleStatus(fHandle);
     if (fNatStatus != stat->natTraversalStatus || fPublicPort != stat->publicPort)
@@ -240 +241 @@
         [fPortStatusProgress startAnimation: self];
         
-        PortChecker * portChecker = [[PortChecker alloc] initWithDelegate: self];
-        [portChecker probePort: fPublicPort];
+        if (fPortChecker)
+        {
+            [fPortChecker endProbe];
+            [fPortChecker release];
+        }
+        fPortChecker = [[PortChecker alloc] initWithDelegate: self];
+        [fPortChecker probePort: fPublicPort];
     }
 }
@@ -253 +259 @@
             [fPortStatusField setStringValue: NSLocalizedString(@"Port is open", "Preferences -> Advanced -> port status")];
             [fPortStatusImage setImage: [NSImage imageNamed: @"GreenDot.png"]];
-            break;
-        case PORT_STATUS_STEALTH:
-            [fPortStatusField setStringValue: NSLocalizedString(@"Port is stealth", "Preferences -> Advanced -> port status")];
-            [fPortStatusImage setImage: [NSImage imageNamed: @"RedDot.png"]];
             break;
         case PORT_STATUS_CLOSED:
@@ -268 +270 @@
             break;
     }
-    [portChecker release];
+    [fPortChecker release];
+    fPortChecker = nil;
 }