X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/d0e2a23f6909335baea90af08491a5160026757b..68089b190f6a03c185722c8532197dacabf52f8d:/ITInetSocket.h

diff --git a/ITInetSocket.h b/ITInetSocket.h
index aaf55b9..592cc5d 100755
--- a/ITInetSocket.h
+++ b/ITInetSocket.h
@@ -16,15 +16,6 @@
  * @abstract Definitions for the ITInetSocket class
  */
 
-/*!
- * @constant ITInetMaxConnections
- * @abstract The maximum number of running ITInetSockets you can have.
- * @discussion The socket will error during a connection request if you are over the maximum.
- */
-
-enum {
-    ITInetMaxConnections = 128
-};
 
 /*!
  * @enum ITInetSocketState
@@ -63,14 +54,7 @@ typedef enum {
  * @abstract Delegate methods for ITInetSocket
  * @discussion ITInetSockets use these methods to communicate with their delegates
  */
-@protocol ITInetSocketDelegate
-/*!
- * @method dataRecieved:
- * @abstract Alerts the delegate of data.
- * @discussion The delegate should check [sender readPipe] to get the data.
- * @param sender The socket that the messages came from.
- */
-- (void) dataRecieved:(in ITInetSocket *)sender;
+@protocol ITInetSocketDelegate <DataReciever>
 /*!
  * @method errorOccured:during:onSocket:
  * @abstract Alerts the delegate of an error condition.
@@ -79,14 +63,14 @@ typedef enum {
  * @param state What the socket was doing when the error occured.
  * @param sender The socket the error occured on.
  */
-- (void) errorOccured:(ITInetSocketError)err during:(ITInetSocketState)state onSocket:(in ITInetSocket*)sender;
+- (oneway void) errorOccured:(ITInetSocketError)err during:(ITInetSocketState)state onSocket:(ITInetSocket*)sender;
 /*!
  * @method finishedConnecting:
  * @abstract Alerts the delegate of a successful connection attempt.
  * @discussion The delegate should send whatever initial data is required for the protocol (nickname for IRC, etc.)
  * @param sender The socket that established the connection.
  */
-- (void) finishedConnecting:(in ITInetSocket *)sender;
+- (oneway void) finishedConnecting:(ITInetSocket *)sender;
 @end
 
 /*!
@@ -94,18 +78,14 @@ typedef enum {
  * @abstract An Internet socket class.
  * @discussion ITInetSocket is an Internet socket class supporting IPv6 and Rendezvous.
  */
-@interface ITInetSocket : NSObject {
-    @public
-    /*!
-     * @var sockfd
-	* @abstract KLWONZ
-     */
+@interface ITInetSocket : NSObject <DataReciever> {
     int sockfd;
     int port;
+    int nc;
     unsigned short bufs;
-    int dieflag;
-    int actionflag;
-    id <ITInetSocketDelegate,NSObject> delegate;
+    volatile int dieflag;
+    volatile int actionflag;
+    id <ITInetSocketDelegate> delegate;
     struct addrinfo *ai, *ai_cur;
     ITByteStream *readPipe, *writePipe;
     ITInetSocketState state;
@@ -118,7 +98,7 @@ typedef enum {
  * @param type The type of Rendezvous service to listen on.
  * @param d The delegate that the sockets will belong to.
  */
-+(void)startAutoconnectingToService:(NSString*)type delegate:(id <ITInetSocketDelegate,NSObject>)d;
++(void)startAutoconnectingToService:(NSString*)type delegate:(id <ITInetSocketDelegate>)d;
 /*!
  * @method initWithFD:delegate:
  * @abstract Wraps a socket around an existing socket descriptor.
@@ -126,14 +106,14 @@ typedef enum {
  * @param fd The descriptor.
  * @param d The delegate for the socket.
  */
--(id) initWithFD:(int)fd delegate:(id <ITInetSocketDelegate,NSObject>)d;
+-(id) initWithFD:(int)fd delegate:(id <ITInetSocketDelegate>)d;
 /*!
  * @method initWithDelegate:
  * @abstract Creates a new socket.
  * @discussion The socket will not be connected to anything.
  * @param d The delegate of the socket.
  */
--(id) initWithDelegate:(id <ITInetSocketDelegate,NSObject>)d;
+-(id) initWithDelegate:(id <ITInetSocketDelegate>)d;
 
 -(id <ITInetSocketDelegate>)delegate;
 -(unsigned short)bufferSize;
@@ -144,4 +124,6 @@ typedef enum {
 -(ITInetSocketState) state;
 -(void) retryConnection;
 -(void) disconnect;
+-(ITByteStream *)readPipe;
+-(ITByteStream *)writePipe;
 @end