From: Daniel M. <tub...@us...> - 2003-12-12 23:24:33
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport In directory sc8-pr-cvs1:/tmp/cvs-serv5162/src/transport Modified Files: Tag: epp-pre02 Makefile.am epp_TransportBase.h epp_TransportConn.h epp_TransportIOStream.cc epp_TransportIOStream.h epp_TransportSSL.cc epp_TransportSSL.h Log Message: bringing the old .info C++ rtk update to gcc 3.x standard for C++ and backporting the improved automake/autoconf from the 0.7.x release of the C++ RTK Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/Makefile.am,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Makefile.am 19 Jun 2001 19:16:38 -0000 1.1 --- Makefile.am 12 Dec 2003 23:24:29 -0000 1.1.2.1 *************** *** 1,7 **** ! noinst_LIBRARIES = libtransport.a ! ! libtransport_a_SOURCES = epp_TransportIOStream.cc epp_TransportSSL.cc ! ! CLEANFILES = *~ DISTCLEANFILES = Makefile.in --- 1,18 ---- ! lib_LIBRARIES = libtransport.a ! ! exportedheaders = \ ! epp_TransportBase.h \ ! epp_TransportConn.h \ ! epp_TransportIOStream.h \ ! epp_TransportSSL.h ! ! pkgincludedir = $(includedir)/$(PACKAGE)/transport ! pkginclude_HEADERS = $(exportedheaders) ! ! libtransport_a_SOURCES = \ ! $(exportedheaders) \ ! epp_TransportIOStream.cc \ ! epp_TransportSSL.cc ! CLEANFILES = *~ DISTCLEANFILES = Makefile.in Index: epp_TransportBase.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportBase.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** epp_TransportBase.h 3 Jul 2001 11:55:33 -0000 1.3 --- epp_TransportBase.h 12 Dec 2003 23:24:29 -0000 1.3.2.1 *************** *** 42,47 **** virtual ~epp_TransportBase() {}; ! virtual void writeToServer(const string & xml_string) = 0; ! virtual string readFromServer() = 0; virtual void connect() {}; --- 42,47 ---- virtual ~epp_TransportBase() {}; ! virtual void writeToServer(const std::string & xml_string) = 0; ! virtual std::string readFromServer() = 0; virtual void connect() {}; *************** *** 50,63 **** ! class epp_TrException : public exception { public: ! string m_error_message; epp_TrException() {}; ! virtual ~epp_TrException() {}; ! epp_TrException(const string & data) throw() { m_error_message = data; --- 50,63 ---- ! class epp_TrException : public std::exception { public: ! std::string m_error_message; epp_TrException() {}; ! virtual ~epp_TrException() throw() {}; ! epp_TrException(const std::string & data) throw() { m_error_message = data; *************** *** 65,74 **** // Kept for backwords compatibility: ! virtual string getString() { return m_error_message; } ! epp_TrException(const string file, const int lineno, const string & data) throw() { char buf[10]; --- 65,74 ---- // Kept for backwords compatibility: ! virtual std::string getString() { return m_error_message; } ! epp_TrException(const std::string file, const int lineno, const std::string & data) throw() { char buf[10]; Index: epp_TransportConn.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportConn.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** epp_TransportConn.h 28 Sep 2001 17:59:55 -0000 1.1.2.1 --- epp_TransportConn.h 12 Dec 2003 23:24:29 -0000 1.1.2.2 *************** *** 36,40 **** class epp_TransportConn : public epp_TransportBase { protected: ! string m_serverName; unsigned long m_serverPort; --- 36,40 ---- class epp_TransportConn : public epp_TransportBase { protected: ! std::string m_serverName; unsigned long m_serverPort; *************** *** 49,61 **** virtual ~epp_TransportConn() {}; ! virtual void writeToServer(const string & xml_string) = 0; ! virtual string readFromServer() = 0; ! virtual void connect(const string & serverName, const unsigned long & serverPort) = 0; virtual void connect() = 0; virtual void disconnect() = 0; // Deprecated, use getServerName instead ! virtual string getServerIP() { return m_serverName; --- 49,61 ---- virtual ~epp_TransportConn() {}; ! virtual void writeToServer(const std::string & xml_string) = 0; ! virtual std::string readFromServer() = 0; ! virtual void connect(const std::string & serverName, const unsigned long & serverPort) = 0; virtual void connect() = 0; virtual void disconnect() = 0; // Deprecated, use getServerName instead ! virtual std::string getServerIP() { return m_serverName; *************** *** 63,67 **** // Deprecated, use setServerName instead ! virtual void setServerIP(const string & serverIP) { m_serverName = serverIP; --- 63,67 ---- // Deprecated, use setServerName instead ! virtual void setServerIP(const std::string & serverIP) { m_serverName = serverIP; *************** *** 78,87 **** } ! virtual string getServerName() { return m_serverName; }; ! virtual void setServerName(const string & serverName) { m_serverName = serverName; --- 78,87 ---- } ! virtual std::string getServerName() { return m_serverName; }; ! virtual void setServerName(const std::string & serverName) { m_serverName = serverName; Index: epp_TransportIOStream.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportIOStream.cc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** epp_TransportIOStream.cc 28 Sep 2001 17:59:55 -0000 1.1.2.1 --- epp_TransportIOStream.cc 12 Dec 2003 23:24:29 -0000 1.1.2.2 *************** *** 28,31 **** --- 28,34 ---- #include "epp_TransportIOStream.h" + #include <iostream> + + using namespace std; using namespace epptransport; Index: epp_TransportIOStream.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportIOStream.h,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** epp_TransportIOStream.h 19 Jun 2001 19:16:38 -0000 1.1 --- epp_TransportIOStream.h 12 Dec 2003 23:24:29 -0000 1.1.2.1 *************** *** 41,46 **** virtual ~epp_TransportIOStream() {}; ! void writeToServer(const string & xml_string); ! string readFromServer(); }; }; --- 41,46 ---- virtual ~epp_TransportIOStream() {}; ! void writeToServer(const std::string & xml_string); ! std::string readFromServer(); }; }; Index: epp_TransportSSL.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** epp_TransportSSL.cc 28 Sep 2001 17:59:55 -0000 1.5.2.1 --- epp_TransportSSL.cc 12 Dec 2003 23:24:29 -0000 1.5.2.2 *************** *** 29,34 **** --- 29,37 ---- #include <openssl/ssl.h> + #include <iostream> + // <FIXME>Some cleanup needed...</fixme> + using namespace std; using namespace epptransport; using namespace npbase; *************** *** 88,93 **** void epp_TransportSSL::connect(const string & serverName, const unsigned long & serverPort, ! const string & certFile, const string & cacertFile = "", ! const string & cacertDir = "") { m_serverName = serverName; --- 91,96 ---- void epp_TransportSSL::connect(const string & serverName, const unsigned long & serverPort, ! const string & certFile, const string & cacertFile, ! const string & cacertDir) { m_serverName = serverName; Index: epp_TransportSSL.h =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.h,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** epp_TransportSSL.h 28 Sep 2001 17:59:55 -0000 1.4.2.1 --- epp_TransportSSL.h 12 Dec 2003 23:24:29 -0000 1.4.2.2 *************** *** 52,58 **** private: ! string m_certFile; ! string m_cacertFile; ! string m_cacertDir; npbase::npssl *sslserver; --- 52,58 ---- private: ! std::string m_certFile; ! std::string m_cacertFile; ! std::string m_cacertDir; npbase::npssl *sslserver; *************** *** 73,115 **** }; ! void writeToServer(const string & xml_string); ! string readFromServer(); ! void connect(const string & serverName, const unsigned long & serverPort); ! void connect(const string & serverName, const unsigned long & serverPort, ! const string & certFile, ! const string & cacertFile = "", ! const string & cacertDir = ""); void connect(); void disconnect(); ! string getCertFile() { return m_certFile; }; ! void setCertFile(const string & certFile) { m_certFile = certFile; } ! string getCACertFile() { return m_cacertFile; } ! void setCACertFile(const string & cacertFile) { m_cacertFile = cacertFile; } ! string getCACertDir() { return m_cacertDir; } ! void setCACertDir(const string & cacertDir) { m_cacertDir = cacertDir; --- 73,115 ---- }; ! void writeToServer(const std::string & xml_string); ! std::string readFromServer(); ! void connect(const std::string & serverName, const unsigned long & serverPort); ! void connect(const std::string & serverName, const unsigned long & serverPort, ! const std::string & certFile, ! const std::string & cacertFile = "", ! const std::string & cacertDir = ""); void connect(); void disconnect(); ! std::string getCertFile() { return m_certFile; }; ! void setCertFile(const std::string & certFile) { m_certFile = certFile; } ! std::string getCACertFile() { return m_cacertFile; } ! void setCACertFile(const std::string & cacertFile) { m_cacertFile = cacertFile; } ! std::string getCACertDir() { return m_cacertDir; } ! void setCACertDir(const std::string & cacertDir) { m_cacertDir = cacertDir; |