Did some tinkering, nothing really useful done though. Removed a useless

[MenuTunes.git] / NetworkController.m

diff --git a/NetworkController.m b/NetworkController.m
index 9edb713..49b8321 100755 (executable)
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -14,6 +14,7 @@
 #import "NetworkController.h"
 #import "MainController.h"
 #import "NetworkObject.h"
 #import "NetworkController.h"
 #import "MainController.h"
 #import "NetworkObject.h"

+#import "PreferencesController.h"

 #import <ITFoundation/ITDebug.h>
 #import <ITFoundation/ITFoundation.h>
 
 #import <ITFoundation/ITDebug.h>
 #import <ITFoundation/ITFoundation.h>
 


@@ -40,7 +41,6 @@ static NetworkController *sharedController;
 {
     [self disconnect];
     if (serverOn) {
 {
     [self disconnect];
     if (serverOn) {

-        [serverConnection invalidate];

         [serverConnection release];
     }
     [serverPass release];
         [serverConnection release];
     }
     [serverPass release];


@@ -69,20 +69,24 @@ static NetworkController *sharedController;
 {
     if (!serverOn && status) {
         NSString *name = [[NSUserDefaults standardUserDefaults] stringForKey:@"sharedPlayerName"];
 {
     if (!serverOn && status) {
         NSString *name = [[NSUserDefaults standardUserDefaults] stringForKey:@"sharedPlayerName"];

+        NSPort *serverPort;

         unsigned char buffer;
         NSData *fullPass;
         //Turn on
         NS_DURING
         unsigned char buffer;
         NSData *fullPass;
         //Turn on
         NS_DURING

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

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

-            [serverConnection setRootObject:[[NetworkObject alloc] init]];
+            clientProxy = [[NetworkObject alloc] init];
+            [serverConnection setRootObject:[clientProxy autorelease]];

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

-            [serverConnection setDelegate:self];

         NS_HANDLER
         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) {


@@ -102,24 +106,24 @@ 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];
         [serverConnection registerName:nil];
     } else if (serverOn && !status && [serverConnection isValid]) {
         //Turn off
         [service stop];
         [serverConnection registerName:nil];

-        [[serverConnection rootObject] release];
-        [serverPort invalidate];
-        [serverConnection invalidate];

         [serverConnection release];
         [serverConnection release];

+        [clientProxy release];

         ITDebugLog(@"Stopped server.");
         serverOn = NO;
     }
 }
 
         ITDebugLog(@"Stopped server.");
         serverOn = NO;
     }
 }
 

-- (BOOL)connectToHost:(NSString *)host
+- (int)connectToHost:(NSString *)host

 {
     NSData *fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"];
     unsigned char buffer;
     ITDebugLog(@"Connecting to host: %@", host);
 {
     NSData *fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"];
     unsigned char buffer;
     ITDebugLog(@"Connecting to host: %@", host);

+    [remoteHost release];

     remoteHost = [host copy];
     if (fullPass) {
         [fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
     remoteHost = [host copy];
     if (fullPass) {
         [fullPass getBytes:&buffer range:NSMakeRange(6, 4)];


@@ -132,19 +136,49 @@ 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 setDelegate:self];

         [clientConnection setReplyTimeout:5];
         clientProxy = [[clientConnection rootProxy] retain];
         [clientConnection setReplyTimeout:5];
         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
     NS_ENDHANDLER

+    
+    if (!clientProxy) {
+        ITDebugLog(@"Null proxy! Couldn't connect!");
+        [self disconnect];
+        return NO;
+    }
+    
+    if ([clientProxy requiresPassword]) {
+        ITDebugLog(@"Server requires password.");
+        //Check to see if a password is set in defaults
+        if ([[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"] == nil) {
+            ITDebugLog(@"Asking for password.");
+            if (![[PreferencesController sharedPrefs] showPasswordPanel]) {
+                ITDebugLog(@"Giving up connection attempt.");
+                [self disconnect];
+                return -1;
+            }
+        }
+        
+        //Send the password
+        ITDebugLog(@"Sending password.");
+        while (![clientProxy sendPassword:[[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"]]) {
+            ITDebugLog(@"Invalid password!");
+            if (![[PreferencesController sharedPrefs] showInvalidPasswordPanel]) {
+                ITDebugLog(@"Giving up connection attempt.");
+                [self disconnect];
+                return -1;
+            }
+        }
+    }
+    

     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 YES;
+    return 1;

 }
 
 - (BOOL)disconnect
 }
 
 - (BOOL)disconnect


@@ -155,7 +189,6 @@ static NetworkController *sharedController;
     remoteHost = nil;
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [clientProxy release];
     remoteHost = nil;
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [clientProxy release];

-    [clientConnection invalidate];

     [clientConnection release];
     return YES;
 }
     [clientConnection release];
     return YES;
 }


@@ -178,20 +211,24 @@ static NetworkController *sharedController;
     
     NS_DURING
         testPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
     
     NS_DURING
         testPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT

-                                           host:host];
+                                         host:host];

         testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain];
         [testConnection setReplyTimeout:2];
         testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain];
         [testConnection setReplyTimeout:2];

-        tempProxy = [testConnection rootProxy];
-        [testConnection setDelegate:self];
+        tempProxy = (NetworkObject *)[testConnection rootProxy];

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

-        [testConnection invalidate];

         [testConnection release];
         [testPort release];
         return NO;
     NS_ENDHANDLER
         [testConnection release];
         [testPort release];
         return NO;
     NS_ENDHANDLER

-    [testConnection invalidate];
+    
+    if (!clientProxy) {
+        ITDebugLog(@"Null proxy! Couldn't connect!");
+        [testConnection release];
+        [testPort release];
+        return NO;
+    }

     [testConnection release];
     [testPort release];
     return YES;
     [testConnection release];
     [testPort release];
     return YES;


@@ -227,21 +264,6 @@ static NetworkController *sharedController;
     return remoteServices;
 }
 
     return remoteServices;
 }
 

-/*- (BOOL)authenticateComponents:(NSArray*)components withData:(NSData *)authenticationData
-{
-    return YES;
-    if (![[NSUserDefaults standardUserDefaults] boolForKey:@"enableSharingPassword"] || [authenticationData isEqualToData:serverPass]) {
-        return YES;
-    } else {
-        return NO;
-    }
-}
-
-- (NSData *)authenticationDataForComponents:(NSArray *)components
-{
-    return clientPass;
-}*/
-

 - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didFindService:(NSNetService *)aNetService moreComing:(BOOL)moreComing
 {
     ITDebugLog(@"Found service named %@.", [aNetService name]);
 - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didFindService:(NSNetService *)aNetService moreComing:(BOOL)moreComing
 {
     ITDebugLog(@"Found service named %@.", [aNetService name]);


@@ -265,7 +287,6 @@ 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];
     [sender stop];
 }
     [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
     [sender stop];
 }