From ff8c7276aef4c1113c7692dc1935db8977623b3a Mon Sep 17 00:00:00 2001
From: Alexander Strange <astrange@ithinksw.com>
Date: Sat, 15 Feb 2003 16:58:54 +0000
Subject: [PATCH] Fixing server sockets a little bit more.

---
 ITInetServerSocket.h |  1 +
 ITInetServerSocket.m | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ITInetServerSocket.h b/ITInetServerSocket.h
index dd5eba6..3185a66 100755
--- a/ITInetServerSocket.h
+++ b/ITInetServerSocket.h
@@ -22,6 +22,7 @@
     id delegate;
     short port;
     NSString *rndType,*rndName;
+    NSTimer *timer;
 }
 
 - (id)init;
diff --git a/ITInetServerSocket.m b/ITInetServerSocket.m
index 8c6ff00..f7ff228 100755
--- a/ITInetServerSocket.m
+++ b/ITInetServerSocket.m
@@ -19,7 +19,7 @@
 
 /* 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;
@@ -28,17 +28,17 @@ static NSTimer *timer;
 -(void)stopConnection;
 -(void)setupRendezvousAdvertising;
 -(void)stopRendezvousAdvertising;
-+(void)setupTimer;
-+(void)stopTimer;
+-(void)setupTimer;
+-(void)stopTimer;
 +(void)globalTimerFunc:(NSTimer*)timer;
--(void)timerFunc;
+-(void)timerFunc:(NSTimer*)timer;
 @end
 
 @implementation ITInetServerSocket
 + (void)initialize
 {
     servsockets = [[NSMutableSet alloc] init];
-    [self setupTimer];
+    //[self setupTimer];
 }
 
 - (id)init
@@ -51,6 +51,7 @@ static NSTimer *timer;
 	   service = nil;
 	   port = 0;
 	   rndType = rndName = nil;
+	   timer = nil;
 	   }
     return self;
 }
@@ -65,6 +66,7 @@ static NSTimer *timer;
 	   service = nil;
 	   port = 0;
 	   rndType = rndName = nil;
+	   timer = nil;
 	   }
     return self;
 }
@@ -175,6 +177,7 @@ static NSTimer *timer;
     listen(sockfd, SOMAXCONN);
     fcntl(sockfd,F_SETFL,O_NONBLOCK);
     [self setupRendezvousAdvertising];
+    [self setupTimer];
 }
 
 - (void)stopConnection
@@ -199,13 +202,13 @@ static NSTimer *timer;
     service = nil;
 }
 
-+ (void)setupTimer
+- (void)setupTimer
 {
-    if (!timer) timer = [NSTimer timerWithTimeInterval:0 target:self selector:@selector(globalTimerFunc:) userInfo:nil repeats:YES];
+    if (!timer) timer = [NSTimer timerWithTimeInterval:0 target:self selector:@selector(timerFunc:) userInfo:nil repeats:YES];
     [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSDefaultRunLoopMode];
 }
 
-+ (void)stopTimer
+- (void)stopTimer
 {
     [timer invalidate];
     [timer release];
@@ -217,7 +220,7 @@ static NSTimer *timer;
     [servsockets makeObjectsPerformSelector:@selector(timerFunc)];
 }
 
-- (void)timerFunc
+- (void)timerFunc:(NSTimer*)timer
 {
     if (sockfd != -1)
 	   {
-- 
2.20.1