From: Christian P. <cp...@us...> - 2005-01-26 10:25:52
|
Update of /cvsroot/pclasses/pclasses2/include/pclasses/Net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25401/include/pclasses/Net Modified Files: InetAddress.h InetSocket.h NetworkAddress.h RTSPHeader.h RTSPSession.h RTSPSocket.h Log Message: Added export-macros. Added StreamSocketServer ctor. Index: RTSPSession.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Net/RTSPSession.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- RTSPSession.h 16 Jan 2005 00:03:20 -0000 1.1 +++ RTSPSession.h 26 Jan 2005 10:25:40 -0000 1.2 @@ -18,6 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include <pclasses/Export.h> #include <string> namespace P { @@ -25,7 +26,7 @@ namespace Net { //! RTSP Session -class RTSPSession { +class PNET_EXPORT RTSPSession { public: enum State { Setup, Index: RTSPHeader.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Net/RTSPHeader.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- RTSPHeader.h 14 Jan 2005 14:56:01 -0000 1.1 +++ RTSPHeader.h 26 Jan 2005 10:25:40 -0000 1.2 @@ -21,6 +21,7 @@ #ifndef P_Net_RTSPHeader_h #define P_Net_RTSPHeader_h +#include <pclasses/Export.h> #include <pclasses/PropertyMap.h> #include <string> @@ -29,7 +30,7 @@ namespace Net { //! RTSP Header base-class -class RTSPHeader: public PropertyMap<std::string, std::string> { +class PNET_EXPORT RTSPHeader: public PropertyMap<std::string, std::string> { public: RTSPHeader(); ~RTSPHeader(); @@ -73,7 +74,7 @@ }; //! RTSP Request header -class RTSPRequestHeader: public RTSPHeader { +class PNET_EXPORT RTSPRequestHeader: public RTSPHeader { public: RTSPRequestHeader(); ~RTSPRequestHeader(); @@ -115,7 +116,7 @@ }; //! RTSP Response header -class RTSPResponseHeader: public RTSPHeader { +class PNET_EXPORT RTSPResponseHeader: public RTSPHeader { public: RTSPResponseHeader(); ~RTSPResponseHeader(); Index: InetSocket.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Net/InetSocket.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- InetSocket.h 23 Dec 2004 04:32:16 -0000 1.2 +++ InetSocket.h 26 Jan 2005 10:25:40 -0000 1.3 @@ -21,6 +21,7 @@ #ifndef P_Net_InetSocket_h #define P_Net_InetSocket_h +#include <pclasses/Export.h> #include <pclasses/Net/Socket.h> #include <pclasses/Net/InetAddress.h> @@ -29,7 +30,7 @@ namespace Net { //! Internet IPv4 Socket -class InetSocket: public virtual Socket { +class PNET_EXPORT InetSocket: public virtual Socket { public: InetSocket() throw(); InetSocket(Type t, int proto) throw(IO::IOError); @@ -42,16 +43,16 @@ int timeToLive() const throw(IO::IOError); protected: - void open(Type type, int proto) throw(LogicError, IO::IOError); + void open(Type type, int proto) throw(IO::IOError); }; //! UDP Datagram Socket -class UDPSocket: public InetSocket, public DatagramSocket { +class PNET_EXPORT UDPSocket: public InetSocket, public DatagramSocket { public: UDPSocket() throw(IO::IOError); ~UDPSocket() throw(); - void open() throw(LogicError, IO::IOError); + void open() throw(IO::IOError); void setMulticastTTL(int ttl) throw(IO::IOError); int multicastTTL() const throw(IO::IOError); @@ -65,12 +66,14 @@ }; //! TCP Streaming Socket -class TCPSocket: public InetSocket, public StreamSocket { +class PNET_EXPORT TCPSocket: public InetSocket, public StreamSocket { public: TCPSocket() throw(IO::IOError); + TCPSocket(StreamSocketServer& srv) throw(IO::IOError); ~TCPSocket() throw(); - void open() throw(LogicError, IO::IOError); + void open() throw(IO::IOError); + void open(StreamSocketServer& srv) throw(IO::IOError); }; Index: NetworkAddress.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Net/NetworkAddress.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- NetworkAddress.h 7 Jan 2005 13:38:22 -0000 1.3 +++ NetworkAddress.h 26 Jan 2005 10:25:40 -0000 1.4 @@ -21,6 +21,7 @@ #ifndef P_Net_NetworkAddress_h #define P_Net_NetworkAddress_h +#include <pclasses/Export.h> #include <pclasses/BasicTypes.h> #include <string> @@ -28,7 +29,7 @@ namespace Net { -class NetworkAddress { +class PNET_EXPORT NetworkAddress { public: NetworkAddress(const NetworkAddress& addr); NetworkAddress(int family, const void* addr, size_t addrLen); Index: RTSPSocket.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Net/RTSPSocket.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- RTSPSocket.h 16 Jan 2005 00:05:00 -0000 1.2 +++ RTSPSocket.h 26 Jan 2005 10:25:40 -0000 1.3 @@ -18,6 +18,10 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#ifndef P_Net_RTSPSocket_h +#define P_Net_RTSPSocket_h + +#include <pclasses/Export.h> #include <pclasses/IO/URL.h> #include <pclasses/IO/IODevice.h> #include <pclasses/Net/Socket.h> @@ -76,7 +80,7 @@ class RTSPSocket; //! RTSP response class -class RTSPResponse: public IO::IODevice { +class PNET_EXPORT RTSPResponse: public IO::IODevice { public: RTSPResponse(const std::string& protoVer, int code, const std::string& reason); @@ -111,10 +115,11 @@ //! RTSP coomunication socket -class RTSPSocket: public StreamSocket { +class PNET_EXPORT RTSPSocket: public StreamSocket { public: RTSPSocket(); RTSPSocket(Socket::Domain d); + RTSPSocket(StreamSocketServer& srv); RTSPSocket(const NetworkAddress& addr, port_t port); ~RTSPSocket() throw(); @@ -138,3 +143,5 @@ } // !namespace Net } // !namespace P + +#endif Index: InetAddress.h =================================================================== RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/Net/InetAddress.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- InetAddress.h 7 Jan 2005 13:40:30 -0000 1.3 +++ InetAddress.h 26 Jan 2005 10:25:40 -0000 1.4 @@ -21,6 +21,7 @@ #ifndef P_Net_InetAddress_h #define P_Net_InetAddress_h +#include <pclasses/Export.h> #include <pclasses/Net/NetworkAddress.h> struct in_addr; @@ -29,7 +30,7 @@ namespace Net { -class InetAddress: public NetworkAddress { +class PNET_EXPORT InetAddress: public NetworkAddress { public: enum Special { Any = 0x00000000, |