Fixed the 10.4 deprecation of -resolve. Will call resolveWithTimeout: in 10.4

[MenuTunes.git] / NetworkController.m

diff --git a/NetworkController.m b/NetworkController.m
index 7bdcac2..c05d1e6 100755 (executable)
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -33,6 +33,8 @@ static NetworkController *sharedController;
         sharedController = self;
         browser = [[NSNetServiceBrowser alloc] init];
         [browser setDelegate:self];
         sharedController = self;
         browser = [[NSNetServiceBrowser alloc] init];
         [browser setDelegate:self];

+        rootObject = [[NetworkObject alloc] init];
+        serverPort = [[NSSocketPort alloc] initWithTCPPort:SERVER_PORT];

     }
     return self;
 }
     }
     return self;
 }


@@ -45,6 +47,8 @@ static NetworkController *sharedController;
     }
     [serverPass release];
     [clientPass release];
     }
     [serverPass release];
     [clientPass release];

+    [serverPort release];
+    [rootObject release];

     [clientProxy release];
     [remoteServices release];
     [browser release];
     [clientProxy release];
     [remoteServices release];
     [browser release];


@@ -73,16 +77,17 @@ static NetworkController *sharedController;
         NSData *fullPass;
         //Turn on
         NS_DURING
         NSData *fullPass;
         //Turn on
         NS_DURING

-            serverPort = [[NSSocketPort alloc] initWithTCPPort:SERVER_PORT];

             serverConnection = [[NSConnection alloc] initWithReceivePort:serverPort
                                                      sendPort:serverPort];
             serverConnection = [[NSConnection alloc] initWithReceivePort:serverPort
                                                      sendPort:serverPort];

-            [serverConnection setRootObject:[[NetworkObject alloc] init]];
+            [serverConnection setRootObject:rootObject];
+            [rootObject makeValid];

             [serverConnection registerName:@"ITMTPlayerHost"];
         NS_HANDLER
             [serverConnection registerName:@"ITMTPlayerHost"];
         NS_HANDLER

-            [[serverConnection rootObject] release];
+            [serverConnection setRootObject:nil];

             [serverConnection release];
             [serverPort release];
             ITDebugLog(@"Error starting server!");
             [serverConnection release];
             [serverPort release];
             ITDebugLog(@"Error starting server!");

+            return;

         NS_ENDHANDLER
         ITDebugLog(@"Started server.");
         if (!name) {
         NS_ENDHANDLER
         ITDebugLog(@"Started server.");
         if (!name) {


@@ -93,7 +98,7 @@ static NetworkController *sharedController;
                                         name:name
                                         port:SERVER_PORT];
         fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"sharedPlayerPassword"];
                                         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)];
             [fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
             [serverPass release];
             serverPass = [[NSData alloc] initWithBytes:&buffer length:strlen(&buffer)];


@@ -102,11 +107,16 @@ static NetworkController *sharedController;
         }
         [service publish];
         serverOn = YES;
         }
         [service publish];
         serverOn = YES;

+        ITDebugLog(@"Server service published.");

     } else if (serverOn && !status && [serverConnection isValid]) {
         //Turn off
         [service stop];
     } else if (serverOn && !status && [serverConnection isValid]) {
         //Turn off
         [service stop];

+        [service release];
+        [rootObject invalidate];

         [serverConnection registerName:nil];
         [serverConnection registerName:nil];

-        [[serverConnection rootObject] release];
+        [serverConnection invalidate];
+        //[serverConnection setRootObject:nil];
+        //[[serverConnection sendPort] autorelease];

         [serverConnection release];
         ITDebugLog(@"Stopped server.");
         serverOn = NO;
         [serverConnection release];
         ITDebugLog(@"Stopped server.");
         serverOn = NO;


@@ -131,19 +141,20 @@ 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];
         clientProxy = [[clientConnection rootProxy] retain];

+        connectedToServer = YES;

     NS_HANDLER
         [clientConnection release];
         [clientPort release];
         ITDebugLog(@"Connection to host failed: %@", host);
     NS_HANDLER
         [clientConnection release];
         [clientPort release];
         ITDebugLog(@"Connection to host failed: %@", host);

-        return NO;
+        return 0;

     NS_ENDHANDLER
     
     if (!clientProxy) {
         ITDebugLog(@"Null proxy! Couldn't connect!");
         [self disconnect];
     NS_ENDHANDLER
     
     if (!clientProxy) {
         ITDebugLog(@"Null proxy! Couldn't connect!");
         [self disconnect];

-        return NO;
+        return 0;

     }
     
     if ([clientProxy requiresPassword]) {
     }
     
     if ([clientProxy requiresPassword]) {


@@ -172,7 +183,6 @@ static NetworkController *sharedController;
     
     ITDebugLog(@"Connected to host: %@", host);
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(disconnect) name:NSConnectionDidDieNotification object:clientConnection];
     
     ITDebugLog(@"Connected to host: %@", host);
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(disconnect) name:NSConnectionDidDieNotification object:clientConnection];

-    connectedToServer = YES;

     return 1;
 }
 
     return 1;
 }
 


@@ -192,9 +202,10 @@ static NetworkController *sharedController;
 {
     NSData *fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"];
     unsigned char buffer;
 {
     NSData *fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"];
     unsigned char buffer;

-    NSConnection *testConnection;
-    NSSocketPort *testPort;
+    NSConnection *testConnection = nil;
+    NSSocketPort *testPort = nil;

     NetworkObject *tempProxy;
     NetworkObject *tempProxy;

+    BOOL valid;

     ITDebugLog(@"Checking for shared remote at %@.", host);
     if (fullPass) {
         [fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
     ITDebugLog(@"Checking for shared remote at %@.", host);
     if (fullPass) {
         [fullPass getBytes:&buffer range:NSMakeRange(6, 4)];


@@ -208,9 +219,11 @@ 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 setReplyTimeout:5];
+        [testConnection setRequestTimeout:5];

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

+        valid = [tempProxy isValid];

     NS_HANDLER
         ITDebugLog(@"Connection to host failed: %@", host);
         [testConnection release];
     NS_HANDLER
         ITDebugLog(@"Connection to host failed: %@", host);
         [testConnection release];


@@ -218,7 +231,7 @@ static NetworkController *sharedController;
         return NO;
     NS_ENDHANDLER
     
         return NO;
     NS_ENDHANDLER
     

-    if (!clientProxy) {
+    if (!tempProxy) {

         ITDebugLog(@"Null proxy! Couldn't connect!");
         [testConnection release];
         [testPort release];
         ITDebugLog(@"Null proxy! Couldn't connect!");
         [testConnection release];
         [testPort release];


@@ -226,7 +239,19 @@ static NetworkController *sharedController;
     }
     [testConnection release];
     [testPort release];
     }
     [testConnection release];
     [testPort release];

-    return YES;
+    return valid;
+}
+
+- (void)resetServerName
+{
+    if ([self isServerOn]) {
+        [service stop];
+        [service release];
+        service = [[NSNetService alloc] initWithDomain:@""
+                                        type:@"_mttp._tcp."
+                                        name:[[NSUserDefaults standardUserDefaults] stringForKey:@"sharedPlayerName"]
+                                        port:SERVER_PORT];
+    }

 }
 
 - (BOOL)isServerOn
 }
 
 - (BOOL)isServerOn


@@ -264,7 +289,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:)]) {
+               [aNetService resolveWithTimeout:5.0];
+       } else {
+               [aNetService resolve];
+       }

     if (!moreComing) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
     }
     if (!moreComing) {
         [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
     }


@@ -282,8 +312,10 @@ static NetworkController *sharedController;
 - (void)netServiceDidResolveAddress:(NSNetService *)sender
 {
     ITDebugLog(@"Resolved service named %@.", [sender name]);
 - (void)netServiceDidResolveAddress:(NSNetService *)sender
 {
     ITDebugLog(@"Resolved service named %@.", [sender name]);

-//  NSLog(@"Resolved service named %@.", [sender name]);

     [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
     [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];

+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"useSharedPlayer"] && !connectedToServer) {
+        [[MainController sharedController] checkForRemoteServerAndConnectImmediately:NO];
+    }

     [sender stop];
 }
 
     [sender stop];
 }