Licensing MenuTunes under the GNU General Public License version 2.

[MenuTunes.git] / NetworkController.m

diff --git a/NetworkController.m b/NetworkController.m
index f2989e3..ac10ab6 100755 (executable)
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -1,16 +1,3 @@
-/*
- *     MenuTunes
- *  NetworkController
- *    Rendezvous network controller
- *
- *  Original Author : Kent Sutherland <ksuther@ithinksw.com>
- *   Responsibility : Kent Sutherland <ksuther@ithinksw.com>
- *
- *  Copyright (c) 2003 iThink Software.
- *  All Rights Reserved
- *
- */
-
 #import "NetworkController.h"
 #import "MainController.h"
 #import "NetworkObject.h"
@@ -98,7 +85,7 @@ static NetworkController *sharedController;
                                         name:name
                                         port:SERVER_PORT];
         fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"sharedPlayerPassword"];
-        if (fullPass) {
+        if ([fullPass length]) {
             [fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
             [serverPass release];
             serverPass = [[NSData alloc] initWithBytes:&buffer length:strlen(&buffer)];
@@ -141,7 +128,7 @@ static NetworkController *sharedController;
         clientPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
                                            host:host];
         clientConnection = [[NSConnection connectionWithReceivePort:nil sendPort:clientPort] retain];
-        [clientConnection setReplyTimeout:5];
+        [clientConnection setReplyTimeout:10];
         clientProxy = [[clientConnection rootProxy] retain];
         connectedToServer = YES;
     NS_HANDLER
@@ -154,7 +141,7 @@ static NetworkController *sharedController;
     if (!clientProxy) {
         ITDebugLog(@"Null proxy! Couldn't connect!");
         [self disconnect];
-        return NO;
+        return 0;
     }
     
     if ([clientProxy requiresPassword]) {
@@ -202,8 +189,8 @@ static NetworkController *sharedController;
 {
     NSData *fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"];
     unsigned char buffer;
-    NSConnection *testConnection;
-    NSSocketPort *testPort;
+    NSConnection *testConnection = nil;
+    NSSocketPort *testPort = nil;
     NetworkObject *tempProxy;
     BOOL valid;
     ITDebugLog(@"Checking for shared remote at %@.", host);
@@ -219,7 +206,8 @@ static NetworkController *sharedController;
         testPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
                                          host:host];
         testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain];
-        [testConnection setReplyTimeout:2];
+        [testConnection setReplyTimeout:5];
+        [testConnection setRequestTimeout:5];
         tempProxy = (NetworkObject *)[testConnection rootProxy];
         [tempProxy serverName];
         valid = [tempProxy isValid];
@@ -230,7 +218,7 @@ static NetworkController *sharedController;
         return NO;
     NS_ENDHANDLER
     
-    if (!clientProxy) {
+    if (!tempProxy) {
         ITDebugLog(@"Null proxy! Couldn't connect!");
         [testConnection release];
         [testPort release];
@@ -288,7 +276,12 @@ static NetworkController *sharedController;
     ITDebugLog(@"Found service named %@.", [aNetService name]);
     [remoteServices addObject:aNetService];
     [aNetService setDelegate:self];
-    [aNetService resolve];
+       //Figure out if it responds to the 10.4 method
+       if ([aNetService respondsToSelector:@selector(resolveWithTimeout:)]) {
+               (void)[aNetService resolveWithTimeout:5.0];
+       } else {
+               [aNetService resolve];
+       }
     if (!moreComing) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
     }
@@ -307,6 +300,9 @@ static NetworkController *sharedController;
 {
     ITDebugLog(@"Resolved service named %@.", [sender name]);
     [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"useSharedPlayer"] && !connectedToServer) {
+        [[MainController sharedController] checkForRemoteServerAndConnectImmediately:NO];
+    }
     [sender stop];
 }