git.ithinksw.org
/
ITFoundation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disabling socket build for now while I revise the APIs
[ITFoundation.git]
/
ITInetServerSocket.m
diff --git
a/ITInetServerSocket.m
b/ITInetServerSocket.m
index
8c6ff00
..
c37ec4f
100755
(executable)
--- a/
ITInetServerSocket.m
+++ b/
ITInetServerSocket.m
@@
-19,7
+19,7
@@
/* Too bad Objective-C doesn't have class variables... */
static NSMutableSet *servsockets;
/* Too bad Objective-C doesn't have class variables... */
static NSMutableSet *servsockets;
-static NSTimer *timer;
+
@interface ITInetServerSocket(Private)
+(void)registerSocket:(ITInetServerSocket*)sock;
+(void)unregisterSocket:(ITInetServerSocket*)sock;
@interface ITInetServerSocket(Private)
+(void)registerSocket:(ITInetServerSocket*)sock;
+(void)unregisterSocket:(ITInetServerSocket*)sock;
@@
-28,17
+28,17
@@
static NSTimer *timer;
-(void)stopConnection;
-(void)setupRendezvousAdvertising;
-(void)stopRendezvousAdvertising;
-(void)stopConnection;
-(void)setupRendezvousAdvertising;
-(void)stopRendezvousAdvertising;
-
+
(void)setupTimer;
-
+
(void)stopTimer;
+
-
(void)setupTimer;
+
-
(void)stopTimer;
+(void)globalTimerFunc:(NSTimer*)timer;
+(void)globalTimerFunc:(NSTimer*)timer;
--(void)timerFunc;
+-(void)timerFunc
:(NSTimer*)timer
;
@end
@implementation ITInetServerSocket
+ (void)initialize
{
servsockets = [[NSMutableSet alloc] init];
@end
@implementation ITInetServerSocket
+ (void)initialize
{
servsockets = [[NSMutableSet alloc] init];
- [self setupTimer];
+
//
[self setupTimer];
}
- (id)init
}
- (id)init
@@
-51,6
+51,7
@@
static NSTimer *timer;
service = nil;
port = 0;
rndType = rndName = nil;
service = nil;
port = 0;
rndType = rndName = nil;
+ timer = nil;
}
return self;
}
}
return self;
}
@@
-65,6
+66,7
@@
static NSTimer *timer;
service = nil;
port = 0;
rndType = rndName = nil;
service = nil;
port = 0;
rndType = rndName = nil;
+ timer = nil;
}
return self;
}
}
return self;
}
@@
-175,6
+177,7
@@
static NSTimer *timer;
listen(sockfd, SOMAXCONN);
fcntl(sockfd,F_SETFL,O_NONBLOCK);
[self setupRendezvousAdvertising];
listen(sockfd, SOMAXCONN);
fcntl(sockfd,F_SETFL,O_NONBLOCK);
[self setupRendezvousAdvertising];
+ [self setupTimer];
}
- (void)stopConnection
}
- (void)stopConnection
@@
-199,13
+202,13
@@
static NSTimer *timer;
service = nil;
}
service = nil;
}
-
+
(void)setupTimer
+
-
(void)setupTimer
{
{
- if (!timer) timer = [NSTimer timerWithTimeInterval:0 target:self selector:@selector(
globalT
imerFunc:) userInfo:nil repeats:YES];
+ if (!timer) timer = [NSTimer timerWithTimeInterval:0 target:self selector:@selector(
t
imerFunc:) userInfo:nil repeats:YES];
[[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
}
[[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
}
-
+
(void)stopTimer
+
-
(void)stopTimer
{
[timer invalidate];
[timer release];
{
[timer invalidate];
[timer release];
@@
-217,7
+220,7
@@
static NSTimer *timer;
[servsockets makeObjectsPerformSelector:@selector(timerFunc)];
}
[servsockets makeObjectsPerformSelector:@selector(timerFunc)];
}
-- (void)timerFunc
+- (void)timerFunc
:(NSTimer*)timer
{
if (sockfd != -1)
{
{
if (sockfd != -1)
{
@@
-230,7
+233,7
@@
static NSTimer *timer;
else {perror("Too bad I haven't implemented error checking yet");}
}
else {
else {perror("Too bad I haven't implemented error checking yet");}
}
else {
- ITInetSocket *csocket = [[
[ITInetSocket alloc] initWithFD:cfd delegate:self] autorelease
];
+ ITInetSocket *csocket = [[
ITInetSocket alloc] initWithFD:cfd delegate:self
];
[clients addObject:csocket];
[delegate newClientJoined:csocket];
}
[clients addObject:csocket];
[delegate newClientJoined:csocket];
}