-/*
- * 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 "PreferencesController.h"
#import <ITFoundation/ITDebug.h>
#import <ITFoundation/ITFoundation.h>
-#import <ITMTRemote/ITMTRemote.h>
static NetworkController *sharedController;
sharedController = self;
browser = [[NSNetServiceBrowser alloc] init];
[browser setDelegate:self];
+ rootObject = [[NetworkObject alloc] init];
+ serverPort = [[NSSocketPort alloc] initWithTCPPort:SERVER_PORT];
}
return self;
}
{
[self disconnect];
if (serverOn) {
- [serverConnection invalidate];
[serverConnection release];
}
[serverPass release];
[clientPass release];
+ [serverPort release];
+ [rootObject release];
[clientProxy release];
[remoteServices release];
[browser release];
NSData *fullPass;
//Turn on
NS_DURING
- serverPort = [[NSSocketPort alloc] initWithTCPPort:SERVER_PORT];
serverConnection = [[NSConnection alloc] initWithReceivePort:serverPort
sendPort:serverPort];
- [serverConnection setRootObject:[[MainController sharedController] currentRemote]];
+ [serverConnection setRootObject:rootObject];
+ [rootObject makeValid];
[serverConnection registerName:@"ITMTPlayerHost"];
- [serverConnection setDelegate:self];
NS_HANDLER
+ [serverConnection setRootObject:nil];
[serverConnection release];
[serverPort release];
ITDebugLog(@"Error starting server!");
+ return;
NS_ENDHANDLER
ITDebugLog(@"Started server.");
if (!name) {
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)];
}
[service publish];
serverOn = YES;
+ ITDebugLog(@"Server service published.");
} else if (serverOn && !status && [serverConnection isValid]) {
//Turn off
[service stop];
+ [service release];
+ [rootObject invalidate];
[serverConnection registerName:nil];
- [serverPort invalidate];
[serverConnection invalidate];
+ //[serverConnection setRootObject:nil];
+ //[[serverConnection sendPort] autorelease];
[serverConnection release];
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);
+ [remoteHost release];
remoteHost = [host copy];
if (fullPass) {
[fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
clientPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
host:host];
clientConnection = [[NSConnection connectionWithReceivePort:nil sendPort:clientPort] retain];
- [clientConnection setDelegate:self];
- [clientConnection setReplyTimeout:5];
+ [clientConnection setReplyTimeout:10];
clientProxy = [[clientConnection rootProxy] retain];
+ connectedToServer = YES;
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];
+ return 0;
+ }
+
+ 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];
- connectedToServer = YES;
- return YES;
+ return 1;
}
- (BOOL)disconnect
remoteHost = nil;
[[NSNotificationCenter defaultCenter] removeObserver:self];
[clientProxy release];
- [clientConnection invalidate];
[clientConnection release];
return YES;
}
{
NSData *fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"];
unsigned char buffer;
- NSConnection *testConnection;
- NSSocketPort *testPort;
- NSDistantObject *tempProxy;
+ NSConnection *testConnection = nil;
+ NSSocketPort *testPort = nil;
+ NetworkObject *tempProxy;
+ BOOL valid;
ITDebugLog(@"Checking for shared remote at %@.", host);
if (fullPass) {
[fullPass getBytes:&buffer range:NSMakeRange(6, 4)];
NS_DURING
testPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT
- host:host];
+ host:host];
testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain];
- [testConnection setReplyTimeout:2];
- tempProxy = [testConnection rootProxy];
- [testConnection setDelegate:self];
- [tempProxy sharedRemoteName];
+ [testConnection setReplyTimeout:5];
+ [testConnection setRequestTimeout:5];
+ tempProxy = (NetworkObject *)[testConnection rootProxy];
+ [tempProxy serverName];
+ valid = [tempProxy isValid];
NS_HANDLER
ITDebugLog(@"Connection to host failed: %@", host);
- [testConnection invalidate];
[testConnection release];
[testPort release];
return NO;
NS_ENDHANDLER
- [testConnection invalidate];
+
+ if (!tempProxy) {
+ ITDebugLog(@"Null proxy! Couldn't connect!");
+ [testConnection release];
+ [testPort release];
+ return NO;
+ }
[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
return remoteHost;
}
-- (ITMTRemote *)sharedRemote
+- (NetworkObject *)networkObject
{
- return (ITMTRemote *)clientProxy;
+ return clientProxy;
}
- (NSArray *)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]);
[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];
}
- (void)netServiceDidResolveAddress:(NSNetService *)sender
{
ITDebugLog(@"Resolved service named %@.", [sender name]);
- NSLog(@"Resolved service named %@.", [sender name]);
[[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil];
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"useSharedPlayer"] && !connectedToServer) {
+ [[MainController sharedController] checkForRemoteServerAndConnectImmediately:NO];
+ }
[sender stop];
}
git.ithinksw.org / MenuTunes.git / blobdiff