mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 17:10:48 +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:
rfm
parent
d15ec8ba01
commit
2243657e33
7 changed files with 2147 additions and 2058 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -1,3 +1,13 @@
|
|||
2007-01-04 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/GSSocketStream.h: derived from GSStream.h
|
||||
* Source/GSSocketStream.m: derived from GSStream.m
|
||||
* Source/GNUmakefile: use new files
|
||||
* Source/GSStream.h: remove code to GSSocketStream.h
|
||||
* Source/GSStream.m: remove code to GSSocketStream.m
|
||||
* Source/unix/NSStream.m: include GSSocketStream.h
|
||||
Minor restructuring for clarity.
|
||||
|
||||
2007-01-04 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Headers/Foundation/NSStream.h: Tweak comments.
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ GSHTTPAuthentication.m \
|
|||
GSHTTPURLHandle.m \
|
||||
GSRunLoopWatcher.m \
|
||||
GSSet.m \
|
||||
GSSocketStream.m \
|
||||
GSStream.m \
|
||||
GSString.m \
|
||||
GSValue.m \
|
||||
|
|
|
|||
234
Source/GSSocketStream.h
Normal file
234
Source/GSSocketStream.h
Normal file
|
|
@ -0,0 +1,234 @@
|
|||
#ifndef INCLUDED_GSSOCKETSTREAM_H
|
||||
#define INCLUDED_GSSOCKETSTREAM_H
|
||||
|
||||
/** Implementation for GSSocketStream for GNUStep
|
||||
Copyright (C) 2006-2008 Free Software Foundation, Inc.
|
||||
|
||||
Written by: Derek Zhou <derekzhou@gmail.com>
|
||||
Written by: Richard Frith-Macdonald <rfm@gnu.org>
|
||||
Date: 2006
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 3 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free
|
||||
Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02111 USA.
|
||||
|
||||
*/
|
||||
|
||||
/* You should have included GSStream.h before this */
|
||||
|
||||
#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
|
||||
|
||||
1895
Source/GSSocketStream.m
Normal file
1895
Source/GSSocketStream.m
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -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
|
||||
|
||||
|
|
|
|||
1861
Source/GSStream.m
1861
Source/GSStream.m
File diff suppressed because it is too large
Load diff
|
|
@ -36,6 +36,7 @@
|
|||
#include <Foundation/NSByteOrder.h>
|
||||
|
||||
#include "../GSStream.h"
|
||||
#include "../GSSocketStream.h"
|
||||
|
||||
/**
|
||||
* The concrete subclass of NSInputStream that reads from a file
|
||||
|
|
|
|||
Loading…
Reference in a new issue