From 05ed443780b3696c53e100d7eee9ae63c633e22d Mon Sep 17 00:00:00 2001
From: Kent Sutherland <ksuther@ithinksw.com>
Date: Wed, 29 Oct 2003 06:45:00 +0000
Subject: [PATCH] More work done to networking. Bugfixes out the wazoo, but
 there's still like 99 left.

---
 English.lproj/Preferences.nib/classes.nib     |   1 +
 English.lproj/Preferences.nib/info.nib        |   4 +++-
 .../Preferences.nib/keyedobjects.nib          | Bin 38095 -> 39331 bytes
 MainController.m                              |  20 +++++++++++++-----
 NetworkController.h                           |   2 +-
 NetworkController.m                           |  12 ++++-------
 PreferencesController.h                       |   1 +
 PreferencesController.m                       |   9 +++++++-
 libValidate.a                                 | Bin 8032 -> 8032 bytes
 9 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/English.lproj/Preferences.nib/classes.nib b/English.lproj/Preferences.nib/classes.nib
index 68f916a..cebb794 100755
--- a/English.lproj/Preferences.nib/classes.nib
+++ b/English.lproj/Preferences.nib/classes.nib
@@ -20,6 +20,7 @@
                 appearanceEffectPopup = NSPopUpButton; 
                 appearanceSpeedSlider = NSSlider; 
                 artistCheckbox = NSButton; 
+                clientPasswordTextField = NSTextField; 
                 hostTextField = NSTextField; 
                 hotKeysTableView = NSTableView; 
                 launchAtLoginCheckbox = NSButton; 
diff --git a/English.lproj/Preferences.nib/info.nib b/English.lproj/Preferences.nib/info.nib
index d4a5e32..1c8a9f3 100755
--- a/English.lproj/Preferences.nib/info.nib
+++ b/English.lproj/Preferences.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>634</key>
 		<string>386 421 380 180 0 0 1152 746 </string>
 		<key>639</key>
-		<string>412 313 380 122 0 0 1152 746 </string>
+		<string>386 450 380 122 0 0 1152 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>349.0</string>
@@ -20,6 +20,8 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>6</integer>
+		<integer>699</integer>
+		<integer>624</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>7B85</string>
diff --git a/English.lproj/Preferences.nib/keyedobjects.nib b/English.lproj/Preferences.nib/keyedobjects.nib
index 7e4be37599dae2e933f70e6a2ac9b589b8595848..e180aca1845d1224a988e1199660e5babe783152 100755
GIT binary patch
delta 10845
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

delta 9827
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

diff --git a/MainController.m b/MainController.m
index aaddc7f..a9e67e9 100755
--- a/MainController.m
+++ b/MainController.m
@@ -945,18 +945,25 @@ static MainController *sharedController;
 
 - (BOOL)connectToServer
 {
+    int result;
     ITDebugLog(@"Attempting to connect to shared remote.");
+    result = [networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]];
     //Connect
-    if ([networkController connectToHost:[df stringForKey:@"sharedPlayerHost"]]) {
+    if (result == 1) {
         currentRemote = [[[networkController networkObject] remote] retain];
         [self timerUpdate];
         //[refreshTimer invalidate];
         ITDebugLog(@"Connection successful.");
         return YES;
-    } else {
+    } else if (result == 0) {
         ITDebugLog(@"Connection failed.");
         currentRemote = [remoteArray objectAtIndex:0];
         return NO;
+    } else if (result == -1) {
+        ITDebugLog(@"Connection failed.");
+        currentRemote = [remoteArray objectAtIndex:0];
+        return NO;
+        //Do something about the password being invalid
     }
 }
 
@@ -977,7 +984,9 @@ static MainController *sharedController;
     if ([networkController checkForServerAtHost:[df stringForKey:@"sharedPlayerHost"]]) {
         ITDebugLog(@"Remote server found.");
         [timer invalidate];
-        [[StatusWindowController sharedController] showReconnectQueryWindow];
+        if (![networkController isConnectedToServer]) {
+            [[StatusWindowController sharedController] showReconnectQueryWindow];
+        }
     } else {
         ITDebugLog(@"Remote server not found.");
     }
@@ -986,9 +995,10 @@ static MainController *sharedController;
 - (void)networkError:(NSException *)exception
 {
     ITDebugLog(@"Remote exception thrown: %@: %@", [exception name], [exception reason]);
-    if ([[exception name] isEqualToString:NSPortTimeoutException]) {
+    NSLog(@"%@", [exception reason]);
+    if ([[exception name] isEqualToString:NSPortTimeoutException] && [networkController isConnectedToServer]) {
         NSRunCriticalAlertPanel(@"Remote MenuTunes Disconnected", @"The MenuTunes server you were connected to stopped responding or quit. MenuTunes will revert back to the local player.", @"OK", nil, nil);
-        if ([networkController isConnectedToServer] && [self disconnectFromServer]) {
+        if ([self disconnectFromServer]) {
             [NSTimer scheduledTimerWithTimeInterval:45 target:self selector:@selector(checkForRemoteServer:) userInfo:nil repeats:YES];
         } else {
             ITDebugLog(@"CRITICAL ERROR, DISCONNECTING!");
diff --git a/NetworkController.h b/NetworkController.h
index ae40030..662e519 100755
--- a/NetworkController.h
+++ b/NetworkController.h
@@ -36,7 +36,7 @@
 - (void)stopRemoteServerSearch;
 
 - (void)setServerStatus:(BOOL)status;
-- (BOOL)connectToHost:(NSString *)host;
+- (int)connectToHost:(NSString *)host;
 - (BOOL)checkForServerAtHost:(NSString *)host;
 - (BOOL)disconnect;
 - (BOOL)isServerOn;
diff --git a/NetworkController.m b/NetworkController.m
index 230e136..65962ba 100755
--- a/NetworkController.m
+++ b/NetworkController.m
@@ -112,7 +112,7 @@ static NetworkController *sharedController;
     }
 }
 
-- (BOOL)connectToHost:(NSString *)host
+- (int)connectToHost:(NSString *)host
 {
     NSData *fullPass = [[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"];
     unsigned char buffer;
@@ -150,18 +150,14 @@ static NetworkController *sharedController;
         if (![clientProxy sendPassword:[[NSUserDefaults standardUserDefaults] dataForKey:@"connectPassword"]]) {
             ITDebugLog(@"Invalid password!");
             [self disconnect];
-            if ( NSRunCriticalAlertPanel(@"Invalid Password", @"The MenuTunes server you attempted to connect to rejected your password. Would you like to try to reconnect?.", @"Yes", @"No", nil) == NSOKButton ) {
-                return [self connectToHost:host];
-            } else {
-                return NO;
-            }
+            return -1;
         }
     }
     
     ITDebugLog(@"Connected to host: %@", host);
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(disconnect) name:NSConnectionDidDieNotification object:clientConnection];
-    connectedToServer = YES;
-    return YES;
+    connectedToServer = 1;
+    return 1;
 }
 
 - (BOOL)disconnect
diff --git a/PreferencesController.h b/PreferencesController.h
index 394934a..9ac7365 100755
--- a/PreferencesController.h
+++ b/PreferencesController.h
@@ -23,6 +23,7 @@
     IBOutlet NSPopUpButton *appearanceEffectPopup;
     IBOutlet NSSlider *appearanceSpeedSlider;
     IBOutlet NSButton *artistCheckbox;
+    IBOutlet NSTextField *clientPasswordTextField;
     IBOutlet NSTextField *hostTextField;
     IBOutlet NSTableView *hotKeysTableView;
     IBOutlet NSButton *launchAtLoginCheckbox;
diff --git a/PreferencesController.m b/PreferencesController.m
index 96c19e8..f6c6d7b 100755
--- a/PreferencesController.m
+++ b/PreferencesController.m
@@ -220,9 +220,14 @@ static PreferencesController *prefs = nil;
         [selectSharedPlayerButton setEnabled:state];
         
         if (state) {
+            [selectedPlayerTextField setStringValue:[[[NetworkController sharedController] networkObject] serverName]];
+            [locationTextField setStringValue:[[NetworkController sharedController] remoteHost]];
             [controller connectToServer];
         } else {
+            [selectedPlayerTextField setStringValue:@"No shared player selected."];
+            [locationTextField setStringValue:@"-"];
             [controller disconnectFromServer];
+            
         }
     } else if ( [sender tag] == 5050 ) {
         //Do nothing on table view click
@@ -266,11 +271,13 @@ static PreferencesController *prefs = nil;
         [NSApp endSheet:selectPlayerSheet];
         [selectPlayerSheet orderOut:nil];
         
+        [self changeSharingSetting:clientPasswordTextField];
+        
         if ([selectPlayerBox contentView] == manualView) {
             [df setObject:[hostTextField stringValue] forKey:@"sharedPlayerHost"];
         } else {
             if ([sharingTableView selectedRow] > -1) {
-                [df setObject:[NSString stringWithCString:inet_ntoa((*(struct sockaddr_in*)[[[[NetworkController sharedController] remoteServices] objectAtIndex:[sharingTableView selectedRow]] bytes]).sin_addr)] forKey:@"sharedPlayerHost"];
+                [df setObject:[NSString stringWithCString:inet_ntoa((*(struct sockaddr_in*)[[[[[[NetworkController sharedController] remoteServices] objectAtIndex:[sharingTableView selectedRow]] addresses] objectAtIndex:0] bytes]).sin_addr)] forKey:@"sharedPlayerHost"];
             }
         }
         
diff --git a/libValidate.a b/libValidate.a
index 4a42a336fe1483cf528e15245308917641b8559c..61c6a97317f9575a607f321d4a580f248c9c3ba3 100755
GIT binary patch
delta 17
YcmaE0_rPv~44a98rG<&bMkPCW06A0zU;qFB

delta 17
YcmaE0_rPv~44bi~frW{|MkPCW068lKR{#J2

-- 
2.20.1