Changeset 6363

Timestamp:

Jul 19, 2008, 2:32:11 PM (15 years ago)

Author:

livings124

Message:

use portcheck.transmissionbt.com instead of a third-party site

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• macosx/PortChecker.h (modified) (1 diff)
• macosx/PortChecker.m (modified) (3 diffs)
• macosx/PrefsController.m (modified) (2 diffs)
• macosx/TransmissionHelp/TransmissionHelp.helpindex (modified) (previous)
• macosx/TransmissionHelp/html/portforward.html (modified) (1 diff)

trunk/NEWS

@@ -20 +20 @@
    + Status strings are toggled from the action button (they are no longer clickable)
    + Colors in pieces bar and pieces box more accurately reflect their corresponding values
+   + The port checker now uses our own portcheck.transmissionbt.com
 - GTK+
    + Add options to inhibit hibernation and to toggle the tray icon

trunk/macosx/PortChecker.h

@@ -30 +30 @@
     PORT_STATUS_OPEN,
     PORT_STATUS_CLOSED,
-    PORT_STATUS_STEALTH,
     PORT_STATUS_ERROR
 } port_status_t;

trunk/macosx/PortChecker.m

@@ -26 +26 @@
 #import "NSApplicationAdditions.h"
 
-#define CHECKER_URL @"https://www.grc.com/x/portprobe=%d"
+#define CHECKER_URL @"http://portcheck.transmissionbt.com/%d"
 #define CHECK_FIRE  3.0
 
@@ -115 +115 @@
 - (void) connectionDidFinishLoading: (NSURLConnection *) connection
 {
-    NSXMLDocument * shieldsUpProbe = [[NSXMLDocument alloc] initWithData: fPortProbeData options: NSXMLDocumentTidyHTML error: nil];
+    NSString * probeString = [[NSString alloc] initWithData: fPortProbeData encoding: NSUTF8StringEncoding];
     [fPortProbeData release];
     fPortProbeData = nil;
     
-    if (shieldsUpProbe)
+    if (probeString)
     {
-        NSArray * nodes = [shieldsUpProbe nodesForXPath: @"/html/body/center/table[3]/tr/td[2]" error: nil];
-        if ([nodes count] == 1)
-        {
-            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];
-            }
-        }
+        if ([probeString isEqualToString: @"1"])
+            [self callBackWithStatus: PORT_STATUS_OPEN];
+        else if ([probeString isEqualToString: @"0"])
+            [self callBackWithStatus: PORT_STATUS_CLOSED];
         else
         {
@@ -144 +130 @@
             [self callBackWithStatus: PORT_STATUS_ERROR];
         }
-        [shieldsUpProbe release];
+        [probeString release];
     }
     else
     {
-        NSLog(@"Unable to get port status: failed to create xml document");
+        NSLog(@"Unable to get port status: invalid data received");
         [self callBackWithStatus: PORT_STATUS_ERROR];
     }

trunk/macosx/PrefsController.m

@@ -57 +57 @@
 #define RPC_KEYCHAIN_NAME       "Remote"
 
-#define WEBUI_URL   @"http://localhost:%d/transmission/clutch/"
+#define WEBUI_URL   @"http://localhost:%d/transmission/web/"
 
 @interface PrefsController (Private)
@@ -378 +378 @@
         case PORT_STATUS_CLOSED:
             [fPortStatusField setStringValue: NSLocalizedString(@"Port is closed", "Preferences -> Network -> port status")];
-            [fPortStatusImage setImage: [NSImage imageNamed: @"RedDot.png"]];
-            break;
-        case PORT_STATUS_STEALTH:
-            [fPortStatusField setStringValue: NSLocalizedString(@"Port is stealth", "Preferences -> Network -> port status")];
             [fPortStatusImage setImage: [NSImage imageNamed: @"RedDot.png"]];
             break;

trunk/macosx/TransmissionHelp/html/portforward.html

@@ -62 +62 @@
 
 
-                                                <p>If you get a red dot and the message 'Port is closed'/'Port is Stealth', <a href="troubleshoot.html">click here</a>.</li>
+                                                <p>If you get a red dot and the message 'Port is closed', <a href="troubleshoot.html">click here</a>.</li>