mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-29 16:01:38 +00:00
Simplify
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25855 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
1abfa12b99
commit
679979b6b2
7 changed files with 2147 additions and 2058 deletions
|
@ -192,208 +192,5 @@ IVARS
|
|||
}
|
||||
@end
|
||||
|
||||
#include "GSNetwork.h"
|
||||
|
||||
|
||||
#define SOCKIVARS \
|
||||
{ \
|
||||
id _sibling; /* For bidirectional traffic. */\
|
||||
BOOL _passive; /* YES means already connected. */\
|
||||
BOOL _closing; /* Must close on next failure. */\
|
||||
SOCKET _sock; /* Needed for ms-windows. */\
|
||||
}
|
||||
|
||||
/* The semi-abstract GSSocketStream class is not intended to be subclassed
|
||||
* but is used to add behaviors to other socket based classes.
|
||||
*/
|
||||
@interface GSSocketStream : GSStream
|
||||
SOCKIVARS
|
||||
|
||||
/**
|
||||
* get the sockaddr
|
||||
*/
|
||||
- (struct sockaddr*) _peerAddr;
|
||||
|
||||
/**
|
||||
* setter for closing flag ... the remote end has stopped either sending
|
||||
* or receiving, so any I/O operation which would block means that the
|
||||
* connection is no longer operable in that direction.
|
||||
*/
|
||||
- (void) _setClosing: (BOOL)passive;
|
||||
|
||||
/**
|
||||
* setter for passive (the underlying socket connection is already open and
|
||||
* doesw not need to be re-opened).
|
||||
*/
|
||||
- (void) _setPassive: (BOOL)passive;
|
||||
|
||||
/**
|
||||
* setter for sibling
|
||||
*/
|
||||
- (void) _setSibling: (GSSocketStream*)sibling;
|
||||
|
||||
/*
|
||||
* Set the socket used for this stream.
|
||||
*/
|
||||
- (void) _setSock: (SOCKET)sock;
|
||||
|
||||
/* Return the socket
|
||||
*/
|
||||
- (SOCKET) _sock;
|
||||
|
||||
/**
|
||||
* Get the length of the socket addr
|
||||
*/
|
||||
- (socklen_t) _sockLen;
|
||||
|
||||
@end
|
||||
|
||||
/**
|
||||
* The abstract subclass of NSInputStream that reads from a socket.
|
||||
* It inherits from GSInputStream and adds behaviors from GSSocketStream
|
||||
* so it must have the same instance variable layout as GSSocketStream.
|
||||
*/
|
||||
@interface GSSocketInputStream : GSInputStream
|
||||
SOCKIVARS
|
||||
@end
|
||||
@interface GSSocketInputStream (AddedBehaviors)
|
||||
- (struct sockaddr*) _peerAddr;
|
||||
- (void) _setClosing: (BOOL)passive;
|
||||
- (void) _setPassive: (BOOL)passive;
|
||||
- (void) _setSibling: (GSSocketStream*)sibling;
|
||||
- (void) _setSock: (SOCKET)sock;
|
||||
- (SOCKET) _sock;
|
||||
- (socklen_t) _sockLen;
|
||||
@end
|
||||
|
||||
@interface GSInetInputStream : GSSocketInputStream
|
||||
{
|
||||
@private
|
||||
struct sockaddr_in _peerAddr;
|
||||
}
|
||||
|
||||
/**
|
||||
* the designated initializer
|
||||
*/
|
||||
- (id) initToAddr: (NSString*)addr port: (int)port;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@interface GSInet6InputStream : GSSocketInputStream
|
||||
{
|
||||
@private
|
||||
#if defined(AF_INET6)
|
||||
struct sockaddr_in6 _peerAddr;
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* the designated initializer
|
||||
*/
|
||||
- (id) initToAddr: (NSString*)addr port: (int)port;
|
||||
|
||||
@end
|
||||
|
||||
/**
|
||||
* The abstract subclass of NSOutputStream that writes to a socket.
|
||||
* It inherits from GSOutputStream and adds behaviors from GSSocketStream
|
||||
* so it must have the same instance variable layout as GSSocketStream.
|
||||
*/
|
||||
@interface GSSocketOutputStream : GSOutputStream
|
||||
SOCKIVARS
|
||||
@end
|
||||
@interface GSSocketOutputStream (AddedBehaviors)
|
||||
- (struct sockaddr*) _peerAddr;
|
||||
- (void) _setClosing: (BOOL)passive;
|
||||
- (void) _setPassive: (BOOL)passive;
|
||||
- (void) _setSibling: (GSSocketStream*)sibling;
|
||||
- (void) _setSock: (SOCKET)sock;
|
||||
- (SOCKET) _sock;
|
||||
- (socklen_t) _sockLen;
|
||||
@end
|
||||
|
||||
@interface GSInetOutputStream : GSSocketOutputStream
|
||||
{
|
||||
@private
|
||||
struct sockaddr_in _peerAddr;
|
||||
}
|
||||
|
||||
/**
|
||||
* the designated initializer
|
||||
*/
|
||||
- (id) initToAddr: (NSString*)addr port: (int)port;
|
||||
|
||||
@end
|
||||
|
||||
@interface GSInet6OutputStream : GSSocketOutputStream
|
||||
{
|
||||
@private
|
||||
#if defined(AF_INET6)
|
||||
struct sockaddr_in6 _peerAddr;
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* the designated initializer
|
||||
*/
|
||||
- (id) initToAddr: (NSString*)addr port: (int)port;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
/**
|
||||
* The subclass of NSStream that accepts connections from a socket.
|
||||
* It inherits from GSAbstractServerStream and adds behaviors from
|
||||
* GSSocketStream so it must have the same instance variable layout
|
||||
* as GSSocketStream.
|
||||
*/
|
||||
@interface GSSocketServerStream : GSAbstractServerStream
|
||||
SOCKIVARS
|
||||
|
||||
/**
|
||||
* Return the class of the inputStream associated with this
|
||||
* type of serverStream.
|
||||
*/
|
||||
- (Class) _inputStreamClass;
|
||||
|
||||
/**
|
||||
* Return the class of the outputStream associated with this
|
||||
* type of serverStream.
|
||||
*/
|
||||
- (Class) _outputStreamClass;
|
||||
|
||||
/**
|
||||
* Return the sockaddr for this server
|
||||
*/
|
||||
- (struct sockaddr*) _serverAddr;
|
||||
|
||||
@end
|
||||
@interface GSSocketServerStream (AddedBehaviors)
|
||||
- (struct sockaddr*) _peerAddr;
|
||||
- (void) _setClosing: (BOOL)passive;
|
||||
- (void) _setPassive: (BOOL)passive;
|
||||
- (void) _setSibling: (GSSocketStream*)sibling;
|
||||
- (void) _setSock: (SOCKET)sock;
|
||||
- (SOCKET) _sock;
|
||||
- (socklen_t) _sockLen;
|
||||
@end
|
||||
|
||||
@interface GSInetServerStream : GSSocketServerStream
|
||||
{
|
||||
@private
|
||||
struct sockaddr_in _serverAddr;
|
||||
}
|
||||
@end
|
||||
|
||||
@interface GSInet6ServerStream : GSSocketServerStream
|
||||
{
|
||||
@private
|
||||
#if defined(AF_INET6)
|
||||
struct sockaddr_in6 _serverAddr;
|
||||
#endif
|
||||
}
|
||||
@end
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue