Merge branch 'master' of git://github.com/ksuther/MenuTunes

[MenuTunes.git] / NetworkController.m

diff --git a/NetworkController.m b/NetworkController.m
index 4204cbb..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"
 #import "NetworkController.h"
 #import "MainController.h"
 #import "NetworkObject.h"


@@ -141,7 +128,7 @@ static NetworkController *sharedController;
         clientPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
                                            host:host];
         clientConnection = [[NSConnection connectionWithReceivePort:nil sendPort:clientPort] retain];
         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
         clientProxy = [[clientConnection rootProxy] retain];
         connectedToServer = YES;
     NS_HANDLER


@@ -219,8 +206,8 @@ static NetworkController *sharedController;
         testPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
                                          host:host];
         testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain];
         testPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
                                          host:host];
         testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain];

-        [testConnection setReplyTimeout:2];
-        [testConnection setRequestTimeout:2];
+        [testConnection setReplyTimeout:5];
+        [testConnection setRequestTimeout:5];

         tempProxy = (NetworkObject *)[testConnection rootProxy];
         [tempProxy serverName];
         valid = [tempProxy isValid];
         tempProxy = (NetworkObject *)[testConnection rootProxy];
         [tempProxy serverName];
         valid = [tempProxy isValid];


@@ -289,7 +276,12 @@ static NetworkController *sharedController;
     ITDebugLog(@"Found service named %@.", [aNetService name]);
     [remoteServices addObject:aNetService];
     [aNetService setDelegate:self];
     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];
     }
     if (!moreComing) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
     }