git.ithinksw.org
/
MenuTunes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d5201ad
)
Weeeee. Hopefully fixed more network bugs.
author
Kent Sutherland
<ksuther@ithinksw.com>
Wed, 10 Dec 2003 00:06:53 +0000
(
00:06
+0000)
committer
Kent Sutherland
<ksuther@ithinksw.com>
Wed, 10 Dec 2003 00:06:53 +0000
(
00:06
+0000)
NetworkController.h
patch
|
blob
|
history
NetworkController.m
patch
|
blob
|
history
NetworkObject.h
patch
|
blob
|
history
NetworkObject.m
patch
|
blob
|
history
StatusWindowController.m
patch
|
blob
|
history
libValidate.a
patch
|
blob
|
history
diff --git
a/NetworkController.h
b/NetworkController.h
index
1f1f799
..
57eee2e
100755
(executable)
--- a/
NetworkController.h
+++ b/
NetworkController.h
@@
-24,11
+24,11
@@
NSMutableArray *remoteServices;
NSConnection *serverConnection, *clientConnection;
NSMutableArray *remoteServices;
NSConnection *serverConnection, *clientConnection;
- NSSocketPort *clientPort;
+ NSSocketPort *clientPort
, *serverPort
;
NSString *remoteHost;
BOOL serverOn, clientConnected, connectedToServer;
NSData *serverPass, *clientPass;
NSString *remoteHost;
BOOL serverOn, clientConnected, connectedToServer;
NSData *serverPass, *clientPass;
- NetworkObject *clientProxy;
+ NetworkObject *
rootObject, *
clientProxy;
}
+ (NetworkController *)sharedController;
}
+ (NetworkController *)sharedController;
diff --git
a/NetworkController.m
b/NetworkController.m
index
70994df
..
6c9631c
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];
@@
-69,19
+73,16
@@
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] autorelease];
serverConnection = [[NSConnection alloc] initWithReceivePort:serverPort
sendPort:serverPort];
serverConnection = [[NSConnection alloc] initWithReceivePort:serverPort
sendPort:serverPort];
-
clientProxy = [[NetworkObject alloc] ini
t];
- [
serverConnection setRootObject:clientProxy
];
+
[serverConnection setRootObject:rootObjec
t];
+ [
rootObject makeValid
];
[serverConnection registerName:@"ITMTPlayerHost"];
NS_HANDLER
[serverConnection registerName:@"ITMTPlayerHost"];
NS_HANDLER
- [clientProxy release];
[serverConnection setRootObject:nil];
[serverConnection release];
[serverPort release];
[serverConnection setRootObject:nil];
[serverConnection release];
[serverPort release];
@@
-110,9
+111,11
@@
static NetworkController *sharedController;
} else if (serverOn && !status && [serverConnection isValid]) {
//Turn off
[service stop];
} else if (serverOn && !status && [serverConnection isValid]) {
//Turn off
[service stop];
- [
clientProxy
invalidate];
+ [
rootObject
invalidate];
[serverConnection registerName:nil];
[serverConnection registerName:nil];
- [serverConnection setRootObject:nil];
+ [serverConnection invalidate];
+ //[serverConnection setRootObject:nil];
+ //[[serverConnection sendPort] autorelease];
[serverConnection release];
ITDebugLog(@"Stopped server.");
serverOn = NO;
[serverConnection release];
ITDebugLog(@"Stopped server.");
serverOn = NO;
diff --git
a/NetworkObject.h
b/NetworkObject.h
index
0e185d4
..
5a3781b
100755
(executable)
--- a/
NetworkObject.h
+++ b/
NetworkObject.h
@@
-30,5
+30,6
@@
- (BOOL)sendPassword:(NSData *)password;
- (void)invalidate;
- (BOOL)sendPassword:(NSData *)password;
- (void)invalidate;
+- (void)makeValid;
- (BOOL)isValid;
@end
- (BOOL)isValid;
@end
diff --git
a/NetworkObject.m
b/NetworkObject.m
index
a29c3f5
..
3c941dc
100755
(executable)
--- a/
NetworkObject.m
+++ b/
NetworkObject.m
@@
-72,6
+72,11
@@
_valid = NO;
}
_valid = NO;
}
+- (void)makeValid
+{
+ _valid = YES;
+}
+
- (BOOL)isValid
{
return _valid;
- (BOOL)isValid
{
return _valid;
diff --git
a/StatusWindowController.m
b/StatusWindowController.m
index
293e35c
..
0a83819
100755
(executable)
--- a/
StatusWindowController.m
+++ b/
StatusWindowController.m
@@
-276,5
+276,4
@@
static StatusWindowController *sharedController;
[_window setLocked:YES];
}
[_window setLocked:YES];
}
-
@end
\ No newline at end of file
@end
\ No newline at end of file
diff --git
a/libValidate.a
b/libValidate.a
index
6e7e58d
..
eb23cd2
100755
(executable)
Binary files a/libValidate.a and b/libValidate.a differ