Menu
▾
▴
epp-rtk-cpp-commits — commit notifications for c++ rtk work
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
(44) |
Mar
(51) |
Apr
(11) |
May
(5) |
Jun
(1) |
Jul
(19) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(3) |
Feb
|
Mar
|
Apr
(24) |
May
(37) |
Jun
(23) |
Jul
(14) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(17) |
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2005 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
(3) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(1) |
Mar
(3) |
Apr
|
May
(1) |
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
(7) |
Dec
|
|
From: Daniel M. <tub...@us...> - 2003-04-29 21:00:20
|
Update of /cvsroot/epp-rtk/epp-rtk/c++ In directory sc8-pr-cvs1:/tmp/cvs-serv2810 Modified Files: configure.in Log Message: removed status command code and files removed status data in result from server brought most of dcp code up to spec with EPP 07 Index: configure.in =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure.in 28 Apr 2003 22:11:57 -0000 1.9 --- configure.in 29 Apr 2003 20:59:38 -0000 1.10 *************** *** 28,32 **** # openssl 0.9.6x from conflicting with unistd.h # in RedHat9 ! CPPFLAGS="-I/usr/local/openssl/include -I/usr/include -I/usr/local/include/ -I/usr/local/xerces -I/usr/local/xerces/include -DPERL5" CXXFLAGS="--ansi -Wall -g -O2" #AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h) --- 28,33 ---- # openssl 0.9.6x from conflicting with unistd.h # in RedHat9 ! AC_DEFINE(PERL5,,[Using this to resolve a conflict between openssl 0.9.6x and unistd.h in crypt() declaration]) ! CPPFLAGS="-I/usr/local/openssl/include -I/usr/include -I/usr/local/include/ -I/usr/local/xerces -I/usr/local/xerces/include" CXXFLAGS="--ansi -Wall -g -O2" #AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h) |
|
From: Daniel M. <tub...@us...> - 2003-04-29 20:59:51
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data
In directory sc8-pr-cvs1:/tmp/cvs-serv2810/src/data
Modified Files:
Makefile.am epp_ResultData.h epp_eppXMLbase.cc
epp_eppXMLbase.h epp_eppdata.h
Removed Files:
epp_StatusReq.h epp_StatusResultData.h epp_StatusRsp.h
Log Message:
removed status command code and files
removed status data in result from server
brought most of dcp code up to spec with EPP 07
Index: Makefile.am
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am 12 Mar 2002 13:32:42 -0000 1.3
--- Makefile.am 29 Apr 2003 20:59:42 -0000 1.4
***************
*** 84,90 ****
epp_Service.h \
epp_ServiceMenu.h \
- epp_StatusReq.h \
- epp_StatusResultData.h \
- epp_StatusRsp.h \
epp_TransID.h \
epp_TransferRequest.h \
--- 84,87 ----
Index: epp_ResultData.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ResultData.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** epp_ResultData.h 17 Jul 2002 13:44:48 -0000 1.3
--- epp_ResultData.h 29 Apr 2003 20:59:42 -0000 1.4
***************
*** 35,39 ****
#include "epp_eppdata.h"
- #include "epp_StatusResultData.h"
namespace eppobject { namespace epp {
--- 35,38 ----
***************
*** 43,48 ****
public:
- epp_StatusResultData_ref m_status; /**< Information in response to a <status> command */
-
/// Null constructor
epp_ResultData() {};
--- 42,45 ----
***************
*** 51,59 ****
virtual ~epp_ResultData() {}
- /// Constructor, using only references
- epp_ResultData(const epp_StatusResultData_ref & _m_status)
- {
- m_status = _m_status;
- };
};
--- 48,51 ----
Index: epp_eppXMLbase.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** epp_eppXMLbase.cc 28 Apr 2003 22:10:54 -0000 1.19
--- epp_eppXMLbase.cc 29 Apr 2003 20:59:43 -0000 1.20
***************
*** 428,455 ****
}
- result.m_data->m_status.ref(new epp_StatusResultData);
-
- dom_ptr statusChildNode = dom_ptr(dataChildNode->getFirstChildElement());
-
- while(!statusChildNode->isNull()) {
-
- // <fixme>Error in draft/IDL: Can max return 1 element...</fixme>
- if(statusChildNode->getNodeName() != "clTRID") {
- throw epp_XMLException(__FILE__, __LINE__, "Unknown sub-element of status-element");
- }
-
- string ack = statusChildNode->getAttribute("ack");
- // cout << "ack: " << ack << endl;
-
- if(ack == "1" || ack == "true") result.m_data->m_status->m_ack.ref(new epp_boolean(true));
- else if(ack == "0" || ack == "false") result.m_data->m_status->m_ack.ref(new epp_boolean(false));
- else throw epp_XMLException(__FILE__, __LINE__, "Empty or unknown ack-attribute");
-
- result.m_data->m_status->m_cltrid.ref(new epp_string(statusChildNode->getNodeData()));
- // cout << "cltrid: " << *result.m_data->m_status->m_cltrid << endl;
-
- statusChildNode = dom_ptr(statusChildNode->getNextSiblingElement());
- } // while "statusChildNode"
-
} // if "data"
--- 428,431 ----
***************
*** 608,629 ****
- epp_string eppobject::epp::returnStatusCommandType(const epp_StatusCommandType & statusCommandType)
- {
- map<epp_StatusCommandType, epp_string> statusCommandMap;
-
- statusCommandMap[CREATE] = "create";
- statusCommandMap[DELETE] = "delete";
- statusCommandMap[RENEW] = "renew";
- statusCommandMap[TRANSFER] = "transfer";
- statusCommandMap[UPDATE] = "update";
-
- if(statusCommandMap.find(statusCommandType) == statusCommandMap.end()) {
- throw epp_XMLException(__FILE__, __LINE__, "Unknown StatusCommandType");
- }
-
- return statusCommandMap[statusCommandType];
- }
-
-
epp_DataCollectionPolicy_ref eppobject::epp::createDCPObject(const domtools::dom_ptr & node)
{
--- 584,587 ----
***************
*** 648,655 ****
if(access == "all") dcp->m_access.ref(new epp_dcpAccessType(ALL));
! else if(access == "noAccess") dcp->m_access.ref(new epp_dcpAccessType(NO_ACCESS));
else if(access == "null") dcp->m_access.ref(new epp_dcpAccessType(NULL_ACCESS));
! else if(access == "social") dcp->m_access.ref(new epp_dcpAccessType(SOCIAL));
! else if(access == "technical") dcp->m_access.ref(new epp_dcpAccessType(TECHNICAL));
else throw epp_XMLException(__FILE__, __LINE__, "Unknown access-type in greeting");
} // if "access"
--- 606,614 ----
if(access == "all") dcp->m_access.ref(new epp_dcpAccessType(ALL));
! else if(access == "none") dcp->m_access.ref(new epp_dcpAccessType(NONE_ACCESS));
else if(access == "null") dcp->m_access.ref(new epp_dcpAccessType(NULL_ACCESS));
! else if(access == "other") dcp->m_access.ref(new epp_dcpAccessType(OTHER));
! else if(access == "personal") dcp->m_access.ref(new epp_dcpAccessType(PERSONAL));
! else if(access == "personalAndOther") dcp->m_access.ref(new epp_dcpAccessType(PERSONAL_AND_OTHER));
else throw epp_XMLException(__FILE__, __LINE__, "Unknown access-type in greeting");
} // if "access"
***************
*** 677,685 ****
string purpose = purposeNode->getNodeName();
! if(purpose == "contact") dcpS.m_purposes->push_back(CONTACT);
! else if(purpose =="dnReg") dcpS.m_purposes->push_back(DN_REG);
! else if(purpose =="ipReg") dcpS.m_purposes->push_back(IP_REG);
else if(purpose =="other") dcpS.m_purposes->push_back(OTHER_PURPOSE);
! else if(purpose =="tmReg") dcpS.m_purposes->push_back(TM_REG);
else throw epp_XMLException(__FILE__, __LINE__, "Unknown purpose-type in greeting");
--- 636,643 ----
string purpose = purposeNode->getNodeName();
! if(purpose == "admin") dcpS.m_purposes->push_back(ADMIN_PURPOSE);
! else if(purpose =="contact") dcpS.m_purposes->push_back(CONTACT);
else if(purpose =="other") dcpS.m_purposes->push_back(OTHER_PURPOSE);
! else if(purpose =="prov") dcpS.m_purposes->push_back(PROV);
else throw epp_XMLException(__FILE__, __LINE__, "Unknown purpose-type in greeting");
***************
*** 698,708 ****
string recipient = recipientNode->getNodeName();
if(recipient == "other") dcpS.m_recipients->push_back(OTHER_RECIPIENT);
! else if(recipient =="ours") dcpS.m_recipients->push_back(OURS);
! else if(recipient =="public") dcpS.m_recipients->push_back(PUBLIK);
else if(recipient =="same") dcpS.m_recipients->push_back(SAME);
else if(recipient =="unrelated") dcpS.m_recipients->push_back(UNRELATED);
else throw epp_XMLException(__FILE__, __LINE__, "Unknown recipient-type in greeting");
!
recipientNode = dom_ptr(recipientNode->getNextSiblingElement());
} // while "recipientNode"
--- 656,671 ----
string recipient = recipientNode->getNodeName();
+ /* skip this whole section for now, until I can get
+ the new epp_dcpRecipient instance settled and stuff.
if(recipient == "other") dcpS.m_recipients->push_back(OTHER_RECIPIENT);
! else if(recipient =="ours") {
! // XXX have to do other stuff here because "ours"
! // recipients structure is complex
! dcpS.m_recipients->push_back(OURS);
! } else if(recipient =="public") dcpS.m_recipients->push_back(PUBLIK);
else if(recipient =="same") dcpS.m_recipients->push_back(SAME);
else if(recipient =="unrelated") dcpS.m_recipients->push_back(UNRELATED);
else throw epp_XMLException(__FILE__, __LINE__, "Unknown recipient-type in greeting");
! */
recipientNode = dom_ptr(recipientNode->getNextSiblingElement());
} // while "recipientNode"
***************
*** 718,725 ****
if(retention == "business") dcpS.m_retention.ref(new epp_dcpRetentionType(BUSINESS));
- else if(retention == "functional") dcpS.m_retention.ref(new epp_dcpRetentionType(FUNCTIONAL));
else if(retention == "indefinite") dcpS.m_retention.ref(new epp_dcpRetentionType(INDEFINITE));
else if(retention == "legal") dcpS.m_retention.ref(new epp_dcpRetentionType(LEGAL));
else if(retention == "none") dcpS.m_retention.ref(new epp_dcpRetentionType(NONE));
else throw epp_XMLException(__FILE__, __LINE__, "Unknown retention-type in greeting");
--- 681,688 ----
if(retention == "business") dcpS.m_retention.ref(new epp_dcpRetentionType(BUSINESS));
else if(retention == "indefinite") dcpS.m_retention.ref(new epp_dcpRetentionType(INDEFINITE));
else if(retention == "legal") dcpS.m_retention.ref(new epp_dcpRetentionType(LEGAL));
else if(retention == "none") dcpS.m_retention.ref(new epp_dcpRetentionType(NONE));
+ else if(retention == "stated") dcpS.m_retention.ref(new epp_dcpRetentionType(STATED));
else throw epp_XMLException(__FILE__, __LINE__, "Unknown retention-type in greeting");
Index: epp_eppXMLbase.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** epp_eppXMLbase.h 28 Apr 2003 20:50:59 -0000 1.14
--- epp_eppXMLbase.h 29 Apr 2003 20:59:43 -0000 1.15
***************
*** 180,190 ****
epp_Service_ref createServiceObject(const domtools::dom_ptr & node);
- /** Returns the corresponsing epp_string text for the given epp_StatusCommandType-enum
- * @param statusCommandType The staus command-type as an epp_StatusCommandType-enum
- * @return The status command-type as an epp_string
- * @throw epp_XMLException If statusType is not a valid epp_TransferOpType
- */
- epp_string returnStatusCommandType(const epp_StatusCommandType & statusCommandType);
-
/** Parses a DataCollectionService dom_ptr and creates the corresponding epp_DataCollectionPolicy object
* @param node The DataCollectionService dom_ptr
--- 180,183 ----
Index: epp_eppdata.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppdata.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** epp_eppdata.h 28 Apr 2003 20:51:01 -0000 1.11
--- epp_eppdata.h 29 Apr 2003 20:59:44 -0000 1.12
***************
*** 80,99 ****
typedef refcnt_ptr<epp_PollOpType> epp_PollOpType_ref;
- /// Type of earlier command requested information about in status command
- enum epp_StatusCommandType
- {
- CREATE,
- DELETE,
- RENEW,
- TRANSFER,
- UPDATE
- };
-
- /// Typedef for the ref to the #epp_StatusCommandType enum
- typedef refcnt_ptr<epp_StatusCommandType> epp_StatusCommandType_ref;
-
/// Authorization information type
enum epp_AuthInfoType {
! PW
};
--- 80,87 ----
typedef refcnt_ptr<epp_PollOpType> epp_PollOpType_ref;
/// Authorization information type
enum epp_AuthInfoType {
! PW,
! EXT
};
***************
*** 120,127 ****
{
ALL,
! NO_ACCESS, // Appended "_ACCESS" to solve name conflict...
NULL_ACCESS, // Appended "_ACCESS" to work in C++
! SOCIAL,
! TECHNICAL
};
--- 108,116 ----
{
ALL,
! NONE_ACCESS, // Appended "_ACCESS" to solve name conflict...
NULL_ACCESS, // Appended "_ACCESS" to work in C++
! OTHER,
! PERSONAL,
! PERSONAL_AND_OTHER
};
***************
*** 132,140 ****
enum epp_dcpPurposeType
{
! CONTACT,
! DN_REG,
! IP_REG,
OTHER_PURPOSE, // Appended "_PURPOSE" to solve name conflict...
! TM_REG
};
--- 121,128 ----
enum epp_dcpPurposeType
{
! ADMIN_PURPOSE,
! CONTACT,
OTHER_PURPOSE, // Appended "_PURPOSE" to solve name conflict...
! PROV
};
***************
*** 159,166 ****
{
BUSINESS,
! FUNCTIONAL,
! INDEFINITE,
! LEGAL,
! NONE
};
--- 147,154 ----
{
BUSINESS,
! INDEFINITE,
! LEGAL,
! NONE,
! STATED
};
***************
*** 168,171 ****
--- 156,168 ----
typedef refcnt_ptr<epp_dcpRetentionType> epp_dcpRetentionType_ref;
+ enum epp_dcpExpiryType {
+ ABSOLUTE,
+ RELATIVE
+ };
+
+ /// Typedef for the ref to the #epp_dcpRetentionType enum
+ typedef refcnt_ptr<epp_dcpExpiryType> epp_dcpExpiryType_ref;
+
+
/// Typedef for a sequence of #epp_dcpPurposeType elements
typedef std::vector<epp_dcpPurposeType> epp_dcpPurpose_seq;
--- epp_StatusReq.h DELETED ---
--- epp_StatusResultData.h DELETED ---
--- epp_StatusRsp.h DELETED ---
|
|
From: Daniel M. <tub...@us...> - 2003-04-29 20:58:18
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv2279/src/transport
Modified Files:
epp_TransportSSL.cc
Log Message:
implement code for writing to the server with the TCP EPP 05 spec
Index: epp_TransportSSL.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** epp_TransportSSL.cc 29 Apr 2003 16:53:57 -0000 1.20
--- epp_TransportSSL.cc 29 Apr 2003 20:58:12 -0000 1.21
***************
*** 77,80 ****
--- 77,93 ----
}
+ // write the 4 byte header...
+ long int message_length = send_xml.length() + 4;
+ char header_bytes[4];
+ bzero(header_bytes, 4);
+ header_bytes[0] = ( message_length & 0xff ) >> 24;
+ header_bytes[1] = ( message_length & 0xff ) >> 16;
+ header_bytes[2] = ( message_length & 0xff ) >> 8;
+ header_bytes[3] = ( message_length & 0xff );
+
+ if ( not sslserver->putchars(header_bytes, 4) ) {
+ throw epp_TrException(__FILE__, __LINE__, "Unable to write epp header to server");
+ }
+
try {
//lint -e534
***************
*** 85,89 ****
}
catch(...) {
! throw epp_TrException(__FILE__, __LINE__, "Unable to write to server");
}
}
--- 98,102 ----
}
catch(...) {
! throw epp_TrException(__FILE__, __LINE__, "Unable to write xml message to server");
}
}
|
|
From: Daniel M. <tub...@us...> - 2003-04-29 20:58:18
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/ssl
In directory sc8-pr-cvs1:/tmp/cvs-serv2279/src/ssl
Modified Files:
npssl.cc npssl.h
Log Message:
implement code for writing to the server with the TCP EPP 05 spec
Index: npssl.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** npssl.cc 29 Apr 2003 16:53:00 -0000 1.5
--- npssl.cc 29 Apr 2003 20:58:11 -0000 1.6
***************
*** 365,368 ****
--- 365,391 ----
}
+ bool npbase::npssl::putchars(const char *outdata, int sizeofdata) {
+
+ const char *temp_ptr = outdata;
+
+ while ( sizeofdata > 0 ) {
+ int byteswrote = SSL_write(ssl, temp_ptr, sizeofdata);
+
+ if (byteswrote == 0) {
+ ERR_print_errors_fp(stderr);
+ return false;
+ }
+
+ if (byteswrote == -1) {
+ ERR_print_errors_fp(stderr);
+ return false;
+ }
+ sizeofdata -= byteswrote;
+ temp_ptr += byteswrote;
+ }
+
+ return true;
+ }
+
bool npbase::npssl::bufferedPutch(char c) {
Index: npssl.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** npssl.h 29 Apr 2003 16:53:02 -0000 1.5
--- npssl.h 29 Apr 2003 20:58:11 -0000 1.6
***************
*** 81,84 ****
--- 81,85 ----
bool putS(const std::string &str);
bool putch(char c);
+ bool putchars(const char *c, int);
bool bufferedPutS(const std::string &str);
bool bufferedPutch(char c);
|
|
From: Daniel M. <tub...@us...> - 2003-04-29 20:56:01
|
Update of /cvsroot/epp-rtk/epp-rtk/c++ In directory sc8-pr-cvs1:/tmp/cvs-serv1242 Modified Files: clean.sh Log Message: remove the deps directory as well Index: clean.sh =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/clean.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clean.sh 19 Jun 2001 19:16:37 -0000 1.1 --- clean.sh 29 Apr 2003 20:55:57 -0000 1.2 *************** *** 6,9 **** --- 6,10 ---- rm -f *~ rm -f src/*~ + rm -rf src/.deps rm -f src/Makefile rm -f src/Makefile.in |
|
From: Daniel M. <tub...@us...> - 2003-04-29 16:54:01
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv6483/transport
Modified Files:
epp_TransportSSL.cc
Log Message:
fixed readFromServer in ssl transport to use 05 draft of EPP TCP (32-bit
big-endian header for length of message)
Index: epp_TransportSSL.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** epp_TransportSSL.cc 28 Apr 2003 20:51:12 -0000 1.19
--- epp_TransportSSL.cc 29 Apr 2003 16:53:57 -0000 1.20
***************
*** 98,135 ****
string s;
try {
! char c;
! while(connected()) {
! if ((c = sslserver->getch()) == EOF) {
! throw epp_TrException(__FILE__, __LINE__, "Unable to read from server (getch)");
! }
! s += c;
! if(c == '<') { // if "<"
! c = sslserver->getch();
! s += c;
! if(c == '/') { // if "</"
! c = sslserver->getch();
! s += c;
! if(c == 'e') { // if "</e"
! c = sslserver->getch();
! s += c;
! if(c == 'p') { // if "</ep"
! c = sslserver->getch();
! s += c;
! if(c == 'p') { // if "</epp"
! c = sslserver->getch();
! s += c;
! if(c == '>') { // if "</epp>"
! break;
! } // if "</epp>"
! } // if "</epp"
! } // if "</ep"
! } // if "</e"
! } // if "</"
! } // if "<"
!
! } // while
}
catch(epp_TrException & e) {
--- 98,128 ----
string s;
+ unsigned long int header_length = 0;
+
try {
! char header[4];
! bzero(header, 4);
! const char *temp_ptr;
! temp_ptr = sslserver->getchars(4);
! if ( temp_ptr[0] == -1 ) {
! throw epp_TrException(__FILE__, __LINE__, "Unable to read header from server");
! }
! memcpy(header, temp_ptr, 4);
+ header_length = ( ( header[0] & 0xff ) << 24 ) |
+ ( ( header[1] & 0xff ) << 16 ) |
+ ( ( header[2] & 0xff ) << 8 ) |
+ ( ( header[3] & 0xff ) );
+
+ header_length -= 4; // less the size of the header
+
+ if ( header_length > 0 ) {
+ temp_ptr = sslserver->getchars(header_length);
+ if ( temp_ptr[0] == -1 ) {
+ throw epp_TrException(__FILE__, __LINE__, "Unable to read xml message from server (byte1)");
+ }
+ s = temp_ptr;
+ }
}
catch(epp_TrException & e) {
|
|
From: Daniel M. <tub...@us...> - 2003-04-29 16:53:09
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/ssl
In directory sc8-pr-cvs1:/tmp/cvs-serv6233/ssl
Modified Files:
npssl.cc npssl.h
Log Message:
added getchars() method to read a specific number of characters
Index: npssl.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** npssl.cc 28 Apr 2003 20:51:07 -0000 1.4
--- npssl.cc 29 Apr 2003 16:53:00 -0000 1.5
***************
*** 223,226 ****
--- 223,255 ----
+ const char* npbase::npssl::getchars(long int length_to_read) {
+
+ memset(buf, 0, (unsigned int)bufsiz);
+
+ char *temp_ptr = buf;
+ while ( length_to_read > 0 ) {
+
+ int bytesread = SSL_read(ssl, temp_ptr, length_to_read);
+
+ if (bytesread == 0) {
+ ERR_print_errors_fp(stderr);
+ string rep = "0";
+ rep[0] = (char)-1;
+ }
+
+ if (bytesread == -1) {
+ ERR_print_errors_fp(stderr);
+ string rep = "0";
+ rep[0] = (char)-1;
+ }
+
+ length_to_read -= bytesread;
+ temp_ptr += bytesread;
+ }
+
+ return buf;
+ }
+
+
string npbase::npssl::getS(void) {
Index: npssl.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** npssl.h 28 Apr 2003 20:51:08 -0000 1.4
--- npssl.h 29 Apr 2003 16:53:02 -0000 1.5
***************
*** 70,73 ****
--- 70,75 ----
std::string getS(void);
char getch(void);
+ // The pointer is only borrowed; the data must be copied.
+ const char* getchars(long int);
std::string bufferedGetS(void);
char bufferedGetch(void);
|
|
From: Daniel M. <tub...@us...> - 2003-04-28 22:12:01
|
Update of /cvsroot/epp-rtk/epp-rtk/c++
In directory sc8-pr-cvs1:/tmp/cvs-serv13831
Modified Files:
configure.in
Log Message:
standardized the location of the xerces headers to be where xerces
expects to find itself (ie. it's own #include's)
Index: configure.in
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** configure.in 28 Apr 2003 20:49:29 -0000 1.8
--- configure.in 28 Apr 2003 22:11:57 -0000 1.9
***************
*** 28,40 ****
# openssl 0.9.6x from conflicting with unistd.h
# in RedHat9
! CPPFLAGS="-I/usr/local/openssl/include -I/usr/include -I/usr/local/include/ -I/usr/local/xerces -I/usr/local/xerces/include/xercesc -DPERL5"
CXXFLAGS="--ansi -Wall -g -O2"
#AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/x509.h,, AC_MSG_ERROR("Missing header - probably missing openssl"))
! AC_CHECK_HEADERS(parsers/DOMParser.hpp util/PlatformUtils.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
AC_CHECK_HEADERS(domtools/domtools.h,, AC_MSG_ERROR("Missing header - probably missing domtools"))
#Only here for deprecated functions:
! AC_CHECK_HEADERS(dom/DOM.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
! AC_CHECK_HEADERS(util/XMLString.hpp util/XMLUniDefs.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
dnl Checks for typedefs, structures, and compiler characteristics.
--- 28,40 ----
# openssl 0.9.6x from conflicting with unistd.h
# in RedHat9
! CPPFLAGS="-I/usr/local/openssl/include -I/usr/include -I/usr/local/include/ -I/usr/local/xerces -I/usr/local/xerces/include -DPERL5"
CXXFLAGS="--ansi -Wall -g -O2"
#AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h openssl/x509.h,, AC_MSG_ERROR("Missing header - probably missing openssl"))
! AC_CHECK_HEADERS(xercesc/parsers/DOMParser.hpp xercesc/util/PlatformUtils.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
AC_CHECK_HEADERS(domtools/domtools.h,, AC_MSG_ERROR("Missing header - probably missing domtools"))
#Only here for deprecated functions:
! AC_CHECK_HEADERS(xercesc/dom/DOM.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
! AC_CHECK_HEADERS(xercesc/util/XMLString.hpp xercesc/util/XMLUniDefs.hpp,, AC_MSG_ERROR("Missing header - probably missing Xerces"))
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
From: Daniel M. <tub...@us...> - 2003-04-28 22:11:00
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data In directory sc8-pr-cvs1:/tmp/cvs-serv13478/src/data Modified Files: epp_eppXMLbase.cc Log Message: standardized the location of the xerces headers to match where xerces expects to find itself Index: epp_eppXMLbase.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** epp_eppXMLbase.cc 28 Apr 2003 20:50:58 -0000 1.18 --- epp_eppXMLbase.cc 28 Apr 2003 22:10:54 -0000 1.19 *************** *** 38,42 **** #include "epp_XMLException.h" #include "epp_Exception.h" ! #include <util/PlatformUtils.hpp> // <FIXME>Depencency on Xerces...</fixme> using namespace std; --- 38,42 ---- #include "epp_XMLException.h" #include "epp_Exception.h" ! #include <xercesc/util/PlatformUtils.hpp> // <FIXME>Depencency on Xerces...</fixme> using namespace std; |
|
From: Daniel M. <tub...@us...> - 2003-04-28 20:54:22
|
Update of /cvsroot/epp-rtk/epp-rtk/c++ In directory sc8-pr-cvs1:/tmp/cvs-serv2224 Modified Files: debug.sh Log Message: updates to the build script to use automake-1.4 if the executable exists Index: debug.sh =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/debug.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** debug.sh 24 Apr 2002 14:42:01 -0000 1.3 --- debug.sh 28 Apr 2003 20:54:15 -0000 1.4 *************** *** 1,3 **** #!/bin/bash ! automake && autoconf && ./configure $* && make clean && make CXXFLAGS=" -ggdb -Wall --ansi" --- 1,8 ---- #!/bin/bash ! which automake-1.4 >/dev/null 2>&1 ! if [ $? -eq 0 ]; then ! automake-1.4 && autoconf && ./configure $* && make clean && make CXXFLAGS=" -ggdb -Wall" ! else ! automake && autoconf && ./configure $* && make clean && make CXXFLAGS=" -ggdb -Wall" ! fi |
|
From: Daniel M. <tub...@us...> - 2003-04-28 20:51:42
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/ssl
In directory sc8-pr-cvs1:/tmp/cvs-serv32286/ssl
Modified Files:
npssl.cc npssl.h
Log Message:
updates to the source for gcc 3.x compliant namespaces (std::string, etc...)
Index: npssl.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** npssl.cc 17 Jul 2002 15:37:03 -0000 1.3
--- npssl.cc 28 Apr 2003 20:51:07 -0000 1.4
***************
*** 29,32 ****
--- 29,33 ----
#include <unistd.h>
+ using namespace std;
using namespace npbase;
Index: npssl.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** npssl.h 17 Jul 2002 15:37:03 -0000 1.3
--- npssl.h 28 Apr 2003 20:51:08 -0000 1.4
***************
*** 45,51 ****
bool server;
! string int_inbuffer;
! string int_outbuffer;
! string readbuffer;
void ssl_error(void);
--- 45,51 ----
bool server;
! std::string int_inbuffer;
! std::string int_outbuffer;
! std::string readbuffer;
void ssl_error(void);
***************
*** 53,57 ****
public:
! void setVerifyLocations(const string &certname, const string &pathname);
void setClientVerification(int mode,int (*verify_callback)(int, X509_STORE_CTX *));
void setClientVerificationDepth(int depth);
--- 53,57 ----
public:
! void setVerifyLocations(const std::string &certname, const std::string &pathname);
void setClientVerification(int mode,int (*verify_callback)(int, X509_STORE_CTX *));
void setClientVerificationDepth(int depth);
***************
*** 61,65 ****
long getVerifyResult( void );
! void setCertFile(const string &filename);
bool handShake(int infd, int outfd);
--- 61,65 ----
long getVerifyResult( void );
! void setCertFile(const std::string &filename);
bool handShake(int infd, int outfd);
***************
*** 68,74 ****
// get functions
! string getS(void);
char getch(void);
! string bufferedGetS(void);
char bufferedGetch(void);
void bufferedUnGetch(char c);
--- 68,74 ----
// get functions
! std::string getS(void);
char getch(void);
! std::string bufferedGetS(void);
char bufferedGetch(void);
void bufferedUnGetch(char c);
***************
*** 77,83 ****
// put functions
! bool putS(const string &str);
bool putch(char c);
! bool bufferedPutS(const string &str);
bool bufferedPutch(char c);
--- 77,83 ----
// put functions
! bool putS(const std::string &str);
bool putch(char c);
! bool bufferedPutS(const std::string &str);
bool bufferedPutch(char c);
|
|
From: Daniel M. <tub...@us...> - 2003-04-28 20:51:42
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/data
In directory sc8-pr-cvs1:/tmp/cvs-serv32286/data
Modified Files:
epp_ContactTrnData.cc epp_DomainTrnData.cc epp_Exception.h
epp_PollResFactory.cc epp_PollResFactory.h epp_XMLException.h
epp_contactXMLbase.cc epp_contactdata.h epp_domainXMLbase.cc
epp_domaindata.h epp_eppXMLbase.cc epp_eppXMLbase.h
epp_eppdata.h epp_hostXMLbase.cc epp_hostdata.h
Log Message:
updates to the source for gcc 3.x compliant namespaces (std::string, etc...)
Index: epp_ContactTrnData.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_ContactTrnData.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** epp_ContactTrnData.cc 12 Mar 2002 20:38:32 -0000 1.2
--- epp_ContactTrnData.cc 28 Apr 2003 20:50:44 -0000 1.3
***************
*** 37,40 ****
--- 37,41 ----
#include "epp_contactXMLbase.h"
+ using namespace std;
using namespace eppobject::contact;
using namespace eppobject::epp;
Index: epp_DomainTrnData.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_DomainTrnData.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** epp_DomainTrnData.cc 12 Mar 2002 20:38:33 -0000 1.3
--- epp_DomainTrnData.cc 28 Apr 2003 20:50:46 -0000 1.4
***************
*** 37,40 ****
--- 37,41 ----
#include "epp_domainXMLbase.h"
+ using namespace std;
using namespace eppobject::domain;
using namespace eppobject::epp;
Index: epp_Exception.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_Exception.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_Exception.h 17 Jul 2002 13:37:30 -0000 1.9
--- epp_Exception.h 28 Apr 2003 20:50:50 -0000 1.10
***************
*** 46,50 ****
/// or, if in the range 2600-2699, communication errors
/// @see epp_Session for more information about error codes
! class epp_Exception : public exception {
public:
--- 46,50 ----
/// or, if in the range 2600-2699, communication errors
/// @see epp_Session for more information about error codes
! class epp_Exception : public std::exception {
public:
***************
*** 57,61 ****
/// Destructor
! virtual ~epp_Exception() {};
/// Constructor with error data
--- 57,61 ----
/// Destructor
! virtual ~epp_Exception() throw() {};
/// Constructor with error data
Index: epp_PollResFactory.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_PollResFactory.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** epp_PollResFactory.cc 17 Jul 2002 13:44:48 -0000 1.3
--- epp_PollResFactory.cc 28 Apr 2003 20:50:52 -0000 1.4
***************
*** 35,38 ****
--- 35,39 ----
#include "epp_PollResFactory.h"
+ using namespace std;
using namespace eppobject::epp;
Index: epp_PollResFactory.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_PollResFactory.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** epp_PollResFactory.h 17 Jul 2002 13:44:48 -0000 1.3
--- epp_PollResFactory.h 28 Apr 2003 20:50:53 -0000 1.4
***************
*** 45,49 ****
private:
/// Typedef of the epp_PollResData factory used in the class
! typedef map<epp_string, epp_PollResData * (*)(), less<epp_string> > FactoryMap;
/// The epp_PollResData factory
static FactoryMap fm;
--- 45,49 ----
private:
/// Typedef of the epp_PollResData factory used in the class
! typedef std::map<epp_string, epp_PollResData * (*)(), std::less<epp_string> > FactoryMap;
/// The epp_PollResData factory
static FactoryMap fm;
***************
*** 64,69 ****
* @return NULL, or a pointer to the corresponding resData object
*/
! static epp_PollResData* create(const string & namespaceURI,
! const string & element);
/** Adds a possible poll resData element to the epp_PollResData factory map
--- 64,69 ----
* @return NULL, or a pointer to the corresponding resData object
*/
! static epp_PollResData* create(const std::string & namespaceURI,
! const std::string & element);
/** Adds a possible poll resData element to the epp_PollResData factory map
***************
*** 72,77 ****
* @param func Name of function used to create an object of the corresponding poll resData class
*/
! static void addClass(const string & namespaceURI,
! const string & element,
epp_PollResData * (* func)());
--- 72,77 ----
* @param func Name of function used to create an object of the corresponding poll resData class
*/
! static void addClass(const std::string & namespaceURI,
! const std::string & element,
epp_PollResData * (* func)());
Index: epp_XMLException.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_XMLException.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_XMLException.h 17 Jul 2002 13:44:48 -0000 1.10
--- epp_XMLException.h 28 Apr 2003 20:50:54 -0000 1.11
***************
*** 41,45 ****
/// Exception class containing information about an error occuring while parsing XML
! class epp_XMLException : public exception {
public:
--- 41,45 ----
/// Exception class containing information about an error occuring while parsing XML
! class epp_XMLException : public std::exception {
public:
***************
*** 50,54 ****
/// Destructor
! virtual ~epp_XMLException() {};
/// Constructor with error data
--- 50,54 ----
/// Destructor
! virtual ~epp_XMLException() throw() {};
/// Constructor with error data
***************
*** 69,75 ****
/// Constructor with error data, file name, and line number
! epp_XMLException(const string & file, const int lineno, const epp_string & data)
{
! string error_message;
char buf[10];
sprintf(buf,"%d",lineno);
--- 69,75 ----
/// Constructor with error data, file name, and line number
! epp_XMLException(const std::string & file, const int lineno, const epp_string & data)
{
! std::string error_message;
char buf[10];
sprintf(buf,"%d",lineno);
Index: epp_contactXMLbase.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_contactXMLbase.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** epp_contactXMLbase.cc 17 Jul 2002 15:01:51 -0000 1.12
--- epp_contactXMLbase.cc 28 Apr 2003 20:50:55 -0000 1.13
***************
*** 38,41 ****
--- 38,42 ----
#include "epp_XMLException.h"
+ using namespace std;
using namespace domtools;
using namespace eppobject::contact;
Index: epp_contactdata.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_contactdata.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** epp_contactdata.h 17 Jul 2002 15:02:11 -0000 1.7
--- epp_contactdata.h 28 Apr 2003 20:50:56 -0000 1.8
***************
*** 73,77 ****
/// Typedef for a sequence of #epp_ContactStatus elements
! typedef vector<epp_ContactStatus> epp_contact_status_seq;
/// Typedef for the ref to #epp_contact_status_seq
--- 73,77 ----
/// Typedef for a sequence of #epp_ContactStatus elements
! typedef std::vector<epp_ContactStatus> epp_contact_status_seq;
/// Typedef for the ref to #epp_contact_status_seq
Index: epp_domainXMLbase.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_domainXMLbase.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_domainXMLbase.cc 17 Jul 2002 15:01:51 -0000 1.9
--- epp_domainXMLbase.cc 28 Apr 2003 20:50:56 -0000 1.10
***************
*** 36,39 ****
--- 36,40 ----
#include "epp_XMLException.h"
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_domaindata.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_domaindata.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_domaindata.h 17 Jul 2002 15:02:11 -0000 1.9
--- epp_domaindata.h 28 Apr 2003 20:50:57 -0000 1.10
***************
*** 108,112 ****
/// Typedef for a sequence of #epp_DomainStatus elements
! typedef vector<epp_DomainStatus> epp_domain_status_seq;
/// Typedef for the ref to #epp_domain_status_seq
--- 108,112 ----
/// Typedef for a sequence of #epp_DomainStatus elements
! typedef std::vector<epp_DomainStatus> epp_domain_status_seq;
/// Typedef for the ref to #epp_domain_status_seq
***************
*** 116,120 ****
/// Typedef for a sequence of #epp_DomainContact elements
! typedef vector<epp_DomainContact> epp_domain_contact_seq;
/// Typedef for the ref to #epp_domain_contact_seq
--- 116,120 ----
/// Typedef for a sequence of #epp_DomainContact elements
! typedef std::vector<epp_DomainContact> epp_domain_contact_seq;
/// Typedef for the ref to #epp_domain_contact_seq
Index: epp_eppXMLbase.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** epp_eppXMLbase.cc 17 Jul 2002 15:01:51 -0000 1.17
--- epp_eppXMLbase.cc 28 Apr 2003 20:50:58 -0000 1.18
***************
*** 40,43 ****
--- 40,44 ----
#include <util/PlatformUtils.hpp> // <FIXME>Depencency on Xerces...</fixme>
+ using namespace std;
using namespace eppobject::epp;
using namespace domtools;
Index: epp_eppXMLbase.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppXMLbase.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** epp_eppXMLbase.h 17 Jul 2002 15:02:11 -0000 1.13
--- epp_eppXMLbase.h 28 Apr 2003 20:50:59 -0000 1.14
***************
*** 170,174 ****
* @throw epp_XMLException If it is unable find the correct XML-elements in the Node
*/
! domtools::dom_ptr getresDataInfo(const domtools::dom_ptr & responseNode, const string & tag);
--- 170,174 ----
* @throw epp_XMLException If it is unable find the correct XML-elements in the Node
*/
! domtools::dom_ptr getresDataInfo(const domtools::dom_ptr & responseNode, const std::string & tag);
***************
*** 224,228 ****
* @deprecated Replaced by getresDataInfo(const domtools::dom_ptr & responseNode, const string & tag);
*/
! DOM_Node getresDataInfo(const DOM_Node & responseNode, const string & tag);
/** Parses a response DOM_Node and creates the corresponding epp_Response object
--- 224,228 ----
* @deprecated Replaced by getresDataInfo(const domtools::dom_ptr & responseNode, const string & tag);
*/
! DOM_Node getresDataInfo(const DOM_Node & responseNode, const std::string & tag);
/** Parses a response DOM_Node and creates the corresponding epp_Response object
Index: epp_eppdata.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_eppdata.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_eppdata.h 17 Jul 2002 15:02:11 -0000 1.10
--- epp_eppdata.h 28 Apr 2003 20:51:01 -0000 1.11
***************
*** 169,173 ****
/// Typedef for a sequence of #epp_dcpPurposeType elements
! typedef vector<epp_dcpPurposeType> epp_dcpPurpose_seq;
/// Typedef for the ref to the #epp_dcpPurpose_seq element
--- 169,173 ----
/// Typedef for a sequence of #epp_dcpPurposeType elements
! typedef std::vector<epp_dcpPurposeType> epp_dcpPurpose_seq;
/// Typedef for the ref to the #epp_dcpPurpose_seq element
***************
*** 175,179 ****
/// Typedef for a sequence of #epp_dcpRecipientType elements
! typedef vector<epp_dcpRecipientType> epp_dcpRecipient_seq;
/// Typedef for the ref to the #epp_dcpRecipient_seq element
--- 175,179 ----
/// Typedef for a sequence of #epp_dcpRecipientType elements
! typedef std::vector<epp_dcpRecipientType> epp_dcpRecipient_seq;
/// Typedef for the ref to the #epp_dcpRecipient_seq element
***************
*** 188,192 ****
/// Defining epp_string to be of type string
! typedef string epp_string;
/// Typedef for the ref to #epp_string
--- 188,192 ----
/// Defining epp_string to be of type string
! typedef std::string epp_string;
/// Typedef for the ref to #epp_string
***************
*** 194,198 ****
/// Typedef for a sequence of epp_strings
! typedef vector<epp_string> epp_string_seq;
/// Typedef for the ref to the #epp_string_seq element
--- 194,198 ----
/// Typedef for a sequence of epp_strings
! typedef std::vector<epp_string> epp_string_seq;
/// Typedef for the ref to the #epp_string_seq element
***************
*** 200,204 ****
/// Defining epp_xml_string to be of type string
! typedef string epp_xml_string;
/// Typedef for the ref to #epp_xml_string
--- 200,204 ----
/// Defining epp_xml_string to be of type string
! typedef std::string epp_xml_string;
/// Typedef for the ref to #epp_xml_string
***************
*** 230,234 ****
/// Defining epp_date to be of type string
! typedef string epp_date;
/// Typedef for the ref to #epp_date
--- 230,234 ----
/// Defining epp_date to be of type string
! typedef std::string epp_date;
/// Typedef for the ref to #epp_date
***************
*** 236,240 ****
/// Defining epp_datetime to be of type string
! typedef string epp_datetime;
/// Typedef for the ref to #epp_datetime
--- 236,240 ----
/// Defining epp_datetime to be of type string
! typedef std::string epp_datetime;
/// Typedef for the ref to #epp_datetime
***************
*** 254,258 ****
/// Typedef for a sequence of epp_roids
! typedef vector<epp_roid> epp_roid_seq;
/// Typedef for the ref to #epp_roid_seq element
--- 254,258 ----
/// Typedef for a sequence of epp_roids
! typedef std::vector<epp_roid> epp_roid_seq;
/// Typedef for the ref to #epp_roid_seq element
***************
*** 262,266 ****
/// Typedef for a sequence of #epp_Result elements
! typedef vector<epp_Result> epp_result_seq;
/// Typedef for the ref to #epp_result_seq
--- 262,266 ----
/// Typedef for a sequence of #epp_Result elements
! typedef std::vector<epp_Result> epp_result_seq;
/// Typedef for the ref to #epp_result_seq
***************
*** 271,275 ****
/// Typedef for a sequence of #epp_Service elements
/// @deprecated From EPP/IDL 05/03 replaced by usage of #epp_string
! typedef vector<epp_Service> epp_service_seq;
/// Typedef for the ref to #epp_service_seq
--- 271,275 ----
/// Typedef for a sequence of #epp_Service elements
/// @deprecated From EPP/IDL 05/03 replaced by usage of #epp_string
! typedef std::vector<epp_Service> epp_service_seq;
/// Typedef for the ref to #epp_service_seq
***************
*** 279,283 ****
/// Typedef for a sequence of #epp_CheckResult elements
! typedef vector<epp_CheckResult> epp_check_result_seq;
/// Typedef for the ref to #epp_check_result_seq
--- 279,283 ----
/// Typedef for a sequence of #epp_CheckResult elements
! typedef std::vector<epp_CheckResult> epp_check_result_seq;
/// Typedef for the ref to #epp_check_result_seq
***************
*** 299,303 ****
/// Typedef for a sequence of #epp_dcpStatement elements
! typedef vector<epp_dcpStatement> epp_dcpStatement_seq;
/// Typedef for the ref to #epp_dcpStatement_seq
--- 299,303 ----
/// Typedef for a sequence of #epp_dcpStatement elements
! typedef std::vector<epp_dcpStatement> epp_dcpStatement_seq;
/// Typedef for the ref to #epp_dcpStatement_seq
Index: epp_hostXMLbase.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_hostXMLbase.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** epp_hostXMLbase.cc 17 Jul 2002 15:01:51 -0000 1.8
--- epp_hostXMLbase.cc 28 Apr 2003 20:51:04 -0000 1.9
***************
*** 36,39 ****
--- 36,40 ----
#include <map>
+ using namespace std;
using namespace domtools;
using namespace eppobject::host;
Index: epp_hostdata.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/data/epp_hostdata.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** epp_hostdata.h 17 Jul 2002 15:02:11 -0000 1.7
--- epp_hostdata.h 28 Apr 2003 20:51:05 -0000 1.8
***************
*** 81,85 ****
/// Typedef for a sequence of #epp_HostStatus elements
! typedef vector<epp_HostStatus> epp_host_status_seq;
/// Typedef for the ref to #epp_host_status_seq
--- 81,85 ----
/// Typedef for a sequence of #epp_HostStatus elements
! typedef std::vector<epp_HostStatus> epp_host_status_seq;
/// Typedef for the ref to #epp_host_status_seq
***************
*** 89,93 ****
/// Typedef for a sequence of #epp_HostAddress elements
! typedef vector<epp_HostAddress> epp_host_address_seq;
/// Typedef for the ref to #epp_host_address_seq
--- 89,93 ----
/// Typedef for a sequence of #epp_HostAddress elements
! typedef std::vector<epp_HostAddress> epp_host_address_seq;
/// Typedef for the ref to #epp_host_address_seq
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32286
Modified Files:
epp_ContactCheck.cc epp_ContactCreate.cc epp_ContactDelete.cc
epp_ContactInfo.cc epp_ContactTransfer.cc epp_ContactUpdate.cc
epp_DomainCheck.cc epp_DomainCreate.cc epp_DomainDelete.cc
epp_DomainInfo.cc epp_DomainRenew.cc epp_DomainTransfer.cc
epp_DomainUpdate.cc epp_HostCheck.cc epp_HostCreate.cc
epp_HostDelete.cc epp_HostInfo.cc epp_HostUpdate.cc
epp_Poll.cc epp_Poll.h epp_Session.cc ltoa.h
main_contactcheck.cc main_contactcreate.cc
main_contactdelete.cc main_contactinfo.cc
main_contacttransfer.cc main_contactupdate.cc
main_domaincheck.cc main_domaincreate.cc main_domaindelete.cc
main_domaininfo.cc main_domainrenew.cc main_domaintransfer.cc
main_domainupdate.cc main_hello.cc main_hostcheck.cc
main_hostcreate.cc main_hostdelete.cc main_hostinfo.cc
main_hostupdate.cc main_login.cc main_loginunspec.cc
main_logout.cc main_poll.cc main_status.cc testTools.cc
testTools.h
Log Message:
updates to the source for gcc 3.x compliant namespaces (std::string, etc...)
Index: epp_ContactCheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactCheck.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_ContactCheck.cc 17 Jul 2002 16:09:32 -0000 1.9
--- epp_ContactCheck.cc 28 Apr 2003 20:50:09 -0000 1.10
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::contact;
Index: epp_ContactCreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactCreate.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_ContactCreate.cc 17 Jul 2002 16:09:32 -0000 1.10
--- epp_ContactCreate.cc 28 Apr 2003 20:50:10 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::contact;
Index: epp_ContactDelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactDelete.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_ContactDelete.cc 17 Jul 2002 16:09:32 -0000 1.10
--- epp_ContactDelete.cc 28 Apr 2003 20:50:10 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::contact;
Index: epp_ContactInfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactInfo.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** epp_ContactInfo.cc 17 Jul 2002 16:09:32 -0000 1.13
--- epp_ContactInfo.cc 28 Apr 2003 20:50:11 -0000 1.14
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::contact;
Index: epp_ContactTransfer.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactTransfer.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_ContactTransfer.cc 17 Jul 2002 16:09:32 -0000 1.10
--- epp_ContactTransfer.cc 28 Apr 2003 20:50:12 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::contact;
Index: epp_ContactUpdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_ContactUpdate.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** epp_ContactUpdate.cc 17 Jul 2002 16:09:33 -0000 1.11
--- epp_ContactUpdate.cc 28 Apr 2003 20:50:12 -0000 1.12
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::contact;
Index: epp_DomainCheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainCheck.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_DomainCheck.cc 17 Jul 2002 16:16:07 -0000 1.9
--- epp_DomainCheck.cc 28 Apr 2003 20:50:12 -0000 1.10
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_DomainCreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainCreate.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_DomainCreate.cc 17 Jul 2002 16:16:07 -0000 1.10
--- epp_DomainCreate.cc 28 Apr 2003 20:50:13 -0000 1.11
***************
*** 35,38 ****
--- 35,39 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_DomainDelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainDelete.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_DomainDelete.cc 17 Jul 2002 16:16:07 -0000 1.10
--- epp_DomainDelete.cc 28 Apr 2003 20:50:13 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_DomainInfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainInfo.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** epp_DomainInfo.cc 17 Jul 2002 16:16:07 -0000 1.11
--- epp_DomainInfo.cc 28 Apr 2003 20:50:14 -0000 1.12
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_DomainRenew.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainRenew.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_DomainRenew.cc 17 Jul 2002 16:16:07 -0000 1.10
--- epp_DomainRenew.cc 28 Apr 2003 20:50:14 -0000 1.11
***************
*** 35,38 ****
--- 35,39 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_DomainTransfer.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainTransfer.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_DomainTransfer.cc 17 Jul 2002 16:16:07 -0000 1.10
--- epp_DomainTransfer.cc 28 Apr 2003 20:50:16 -0000 1.11
***************
*** 35,38 ****
--- 35,39 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_DomainUpdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_DomainUpdate.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_DomainUpdate.cc 17 Jul 2002 16:16:07 -0000 1.10
--- epp_DomainUpdate.cc 28 Apr 2003 20:50:16 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::domain;
Index: epp_HostCheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostCheck.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_HostCheck.cc 17 Jul 2002 16:22:52 -0000 1.9
--- epp_HostCheck.cc 28 Apr 2003 20:50:17 -0000 1.10
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::host;
Index: epp_HostCreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostCreate.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_HostCreate.cc 17 Jul 2002 16:22:52 -0000 1.9
--- epp_HostCreate.cc 28 Apr 2003 20:50:17 -0000 1.10
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::host;
Index: epp_HostDelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostDelete.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_HostDelete.cc 17 Jul 2002 16:22:52 -0000 1.10
--- epp_HostDelete.cc 28 Apr 2003 20:50:18 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::host;
Index: epp_HostInfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostInfo.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** epp_HostInfo.cc 17 Jul 2002 16:22:52 -0000 1.10
--- epp_HostInfo.cc 28 Apr 2003 20:50:19 -0000 1.11
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::host;
Index: epp_HostUpdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_HostUpdate.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_HostUpdate.cc 17 Jul 2002 16:22:52 -0000 1.9
--- epp_HostUpdate.cc 28 Apr 2003 20:50:20 -0000 1.10
***************
*** 34,37 ****
--- 34,38 ----
+ using namespace std;
using namespace domtools;
using namespace eppobject::host;
Index: epp_Poll.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Poll.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** epp_Poll.cc 18 Jul 2002 09:57:09 -0000 1.11
--- epp_Poll.cc 28 Apr 2003 20:50:20 -0000 1.12
***************
*** 34,37 ****
--- 34,38 ----
#include "data/epp_PollResFactory.h"
+ using namespace std;
using namespace domtools;
using namespace eppobject::epp;
Index: epp_Poll.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Poll.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** epp_Poll.h 18 Jul 2002 09:57:09 -0000 1.9
--- epp_Poll.h 28 Apr 2003 20:50:21 -0000 1.10
***************
*** 52,56 ****
epp_PollRsp_ref m_response; /**< Response received from server */
! map<epp_PollOpType, string> pollReqTypeMap; /**< Map with the different <poll> request types */
void initReqMap(); /**< Private function to fill the #pollReqTypeMap */
--- 52,56 ----
epp_PollRsp_ref m_response; /**< Response received from server */
! std::map<epp_PollOpType, std::string> pollReqTypeMap; /**< Map with the different <poll> request types */
void initReqMap(); /**< Private function to fill the #pollReqTypeMap */
Index: epp_Session.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/epp_Session.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** epp_Session.cc 18 Jul 2002 09:57:09 -0000 1.8
--- epp_Session.cc 28 Apr 2003 20:50:22 -0000 1.9
***************
*** 29,32 ****
--- 29,33 ----
#include "epp_Hello.h"
+ using namespace std;
using namespace eppobject::epp;
Index: ltoa.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ltoa.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ltoa.h 8 Mar 2002 12:14:44 -0000 1.3
--- ltoa.h 28 Apr 2003 20:50:22 -0000 1.4
***************
*** 32,36 ****
#include <cstdio>
! inline string ltoa(const long i) {
char buf[20];
sprintf(buf,"%ld",i);
--- 32,36 ----
#include <cstdio>
! inline std::string ltoa(const long i) {
char buf[20];
sprintf(buf,"%ld",i);
Index: main_contactcheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcheck.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_contactcheck.cc 22 Jul 2002 13:15:26 -0000 1.12
--- main_contactcheck.cc 28 Apr 2003 20:50:22 -0000 1.13
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_ContactCheckReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_ContactCheckReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::contact;
using namespace eppobject::epp;
Index: main_contactcreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcreate.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main_contactcreate.cc 22 Jul 2002 13:15:26 -0000 1.13
--- main_contactcreate.cc 28 Apr 2003 20:50:24 -0000 1.14
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_ContactCreateReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_ContactCreateReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::contact;
using namespace eppobject::epp;
Index: main_contactdelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactdelete.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_contactdelete.cc 22 Jul 2002 13:15:26 -0000 1.12
--- main_contactdelete.cc 28 Apr 2003 20:50:24 -0000 1.13
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_ContactDeleteReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_ContactDeleteReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::contact;
using namespace eppobject::epp;
Index: main_contactinfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactinfo.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** main_contactinfo.cc 22 Jul 2002 13:15:26 -0000 1.14
--- main_contactinfo.cc 28 Apr 2003 20:50:24 -0000 1.15
***************
*** 28,32 ****
#include <string>
#include <vector>
! #include <iostream.h>
#include "data/epp_ContactInfoReq.h"
--- 28,32 ----
#include <string>
#include <vector>
! #include <iostream>
#include "data/epp_ContactInfoReq.h"
***************
*** 40,43 ****
--- 40,44 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::contact;
using namespace eppobject::epp;
Index: main_contacttransfer.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contacttransfer.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_contacttransfer.cc 22 Jul 2002 13:15:26 -0000 1.12
--- main_contacttransfer.cc 28 Apr 2003 20:50:26 -0000 1.13
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_ContactTransferReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_ContactTransferReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "data/epp_eppXMLbase.h"
+ using namespace std;
using namespace eppobject::contact;
using namespace eppobject::epp;
Index: main_contactupdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactupdate.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main_contactupdate.cc 22 Jul 2002 13:15:26 -0000 1.13
--- main_contactupdate.cc 28 Apr 2003 20:50:28 -0000 1.14
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_ContactUpdateReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_ContactUpdateReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::contact;
using namespace eppobject::epp;
Index: main_domaincheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaincheck.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_domaincheck.cc 22 Jul 2002 13:15:26 -0000 1.11
--- main_domaincheck.cc 28 Apr 2003 20:50:28 -0000 1.12
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_DomainCheckReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_DomainCheckReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::domain;
using namespace eppobject::epp;
Index: main_domaincreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaincreate.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_domaincreate.cc 22 Jul 2002 13:15:26 -0000 1.12
--- main_domaincreate.cc 28 Apr 2003 20:50:28 -0000 1.13
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_DomainCreateReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_DomainCreateReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::domain;
using namespace eppobject::epp;
Index: main_domaindelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaindelete.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_domaindelete.cc 22 Jul 2002 13:15:26 -0000 1.11
--- main_domaindelete.cc 28 Apr 2003 20:50:28 -0000 1.12
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_DomainDeleteReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_DomainDeleteReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::domain;
using namespace eppobject::epp;
Index: main_domaininfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaininfo.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main_domaininfo.cc 22 Jul 2002 13:15:26 -0000 1.13
--- main_domaininfo.cc 28 Apr 2003 20:50:29 -0000 1.14
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_DomainInfoReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_DomainInfoReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::domain;
//using namespace eppobject::epp; //<fixme>to solve "ALL" conflict...</fixme>
***************
*** 107,112 ****
i != req->m_name_servers->end(); i++)
{
! if(i != NULL)
! cerr << "<domain:ns>" << *i << "</domain:ns>" << endl;
}
}
--- 108,112 ----
i != req->m_name_servers->end(); i++)
{
! cerr << "<domain:ns>" << *i << "</domain:ns>" << endl;
}
}
***************
*** 117,122 ****
i != req->m_hosts->end(); i++)
{
! if(i != NULL)
! cerr << "<domain:host>" << *i << "</domain:host>" << endl;
}
}
--- 117,121 ----
i != req->m_hosts->end(); i++)
{
! cerr << "<domain:host>" << *i << "</domain:host>" << endl;
}
}
Index: main_domainrenew.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domainrenew.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_domainrenew.cc 22 Jul 2002 13:15:26 -0000 1.12
--- main_domainrenew.cc 28 Apr 2003 20:50:29 -0000 1.13
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_DomainRenewReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_DomainRenewReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::domain;
using namespace eppobject::epp;
Index: main_domaintransfer.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaintransfer.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_domaintransfer.cc 22 Jul 2002 13:15:27 -0000 1.12
--- main_domaintransfer.cc 28 Apr 2003 20:50:30 -0000 1.13
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_DomainTransferReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_DomainTransferReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "data/epp_eppXMLbase.h"
+ using namespace std;
using namespace eppobject::domain;
using namespace eppobject::epp;
Index: main_domainupdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domainupdate.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main_domainupdate.cc 22 Jul 2002 13:15:27 -0000 1.13
--- main_domainupdate.cc 28 Apr 2003 20:50:31 -0000 1.14
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_DomainUpdateReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_DomainUpdateReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::domain;
using namespace eppobject::epp;
Index: main_hello.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hello.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main_hello.cc 18 Jul 2002 10:10:39 -0000 1.10
--- main_hello.cc 28 Apr 2003 20:50:32 -0000 1.11
***************
*** 32,36 ****
#include <string>
! #include <iostream.h>
#include "data/epp_Greeting.h"
--- 32,36 ----
#include <string>
! #include <iostream>
#include "data/epp_Greeting.h"
***************
*** 43,46 ****
--- 43,47 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::epp;
Index: main_hostcheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostcheck.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_hostcheck.cc 22 Jul 2002 13:15:27 -0000 1.11
--- main_hostcheck.cc 28 Apr 2003 20:50:32 -0000 1.12
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_HostCheckReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_HostCheckReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::host;
using namespace eppobject::epp;
Index: main_hostcreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostcreate.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main_hostcreate.cc 22 Jul 2002 13:15:27 -0000 1.13
--- main_hostcreate.cc 28 Apr 2003 20:50:33 -0000 1.14
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_HostCreateReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_HostCreateReq.h"
***************
*** 40,43 ****
--- 40,44 ----
+ using namespace std;
using namespace eppobject::host;
using namespace eppobject::epp;
Index: main_hostdelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostdelete.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_hostdelete.cc 22 Jul 2002 13:15:27 -0000 1.11
--- main_hostdelete.cc 28 Apr 2003 20:50:34 -0000 1.12
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_HostDeleteReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_HostDeleteReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::host;
using namespace eppobject::epp;
Index: main_hostinfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostinfo.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_hostinfo.cc 22 Jul 2002 13:15:27 -0000 1.12
--- main_hostinfo.cc 28 Apr 2003 20:50:35 -0000 1.13
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_HostInfoReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_HostInfoReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::host;
using namespace eppobject::epp;
Index: main_hostupdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostupdate.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main_hostupdate.cc 22 Jul 2002 13:15:27 -0000 1.13
--- main_hostupdate.cc 28 Apr 2003 20:50:35 -0000 1.14
***************
*** 27,31 ****
#include <vector>
! #include <iostream.h>
#include "data/epp_HostUpdateReq.h"
--- 27,31 ----
#include <vector>
! #include <iostream>
#include "data/epp_HostUpdateReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::host;
using namespace eppobject::epp;
Index: main_login.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_login.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_login.cc 22 Jul 2002 13:15:27 -0000 1.12
--- main_login.cc 28 Apr 2003 20:50:36 -0000 1.13
***************
*** 33,37 ****
#include <string>
#include <vector>
! #include <iostream.h>
#include "data/epp_LoginReq.h"
--- 33,37 ----
#include <string>
#include <vector>
! #include <iostream>
#include "data/epp_LoginReq.h"
***************
*** 44,47 ****
--- 44,48 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::epp;
Index: main_loginunspec.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_loginunspec.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main_loginunspec.cc 18 Jul 2002 10:12:58 -0000 1.8
--- main_loginunspec.cc 28 Apr 2003 20:50:37 -0000 1.9
***************
*** 28,32 ****
#include <string>
#include <vector>
! #include <iostream.h>
#include "data/epp_LoginReq.h"
--- 28,32 ----
#include <string>
#include <vector>
! #include <iostream>
#include "data/epp_LoginReq.h"
***************
*** 40,43 ****
--- 40,44 ----
#include "unspec/epp_UnspecTest.h"
+ using namespace std;
using namespace eppobject::epp;
Index: main_logout.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_logout.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** main_logout.cc 22 Jul 2002 13:15:27 -0000 1.9
--- main_logout.cc 28 Apr 2003 20:50:37 -0000 1.10
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_LogoutReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_LogoutReq.h"
***************
*** 38,41 ****
--- 38,42 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::epp;
Index: main_poll.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_poll.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_poll.cc 22 Jul 2002 13:15:27 -0000 1.12
--- main_poll.cc 28 Apr 2003 20:50:38 -0000 1.13
***************
*** 27,31 ****
#include <string>
! #include <iostream.h>
#include "data/epp_PollReq.h"
--- 27,31 ----
#include <string>
! #include <iostream>
#include "data/epp_PollReq.h"
***************
*** 40,43 ****
--- 40,44 ----
#include "data/epp_contactXMLbase.h"
+ using namespace std;
using namespace eppobject::epp;
using namespace eppobject::domain;
Index: main_status.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_status.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main_status.cc 18 Jul 2002 10:12:58 -0000 1.3
--- main_status.cc 28 Apr 2003 20:50:38 -0000 1.4
***************
*** 28,32 ****
#include <string>
#include <vector>
! #include <iostream.h>
#include "data/epp_StatusReq.h"
--- 28,32 ----
#include <string>
#include <vector>
! #include <iostream>
#include "data/epp_StatusReq.h"
***************
*** 39,42 ****
--- 39,43 ----
#include "testTools.h"
+ using namespace std;
using namespace eppobject::epp;
Index: testTools.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** testTools.cc 22 Jul 2002 13:07:10 -0000 1.16
--- testTools.cc 28 Apr 2003 20:50:38 -0000 1.17
***************
*** 43,46 ****
--- 43,47 ----
#include "transport/transports.h"
+ using namespace std;
using namespace eppobject::epp;
using namespace epptransport;
Index: testTools.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/testTools.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** testTools.h 22 Jul 2002 13:07:10 -0000 1.13
--- testTools.h 28 Apr 2003 20:50:39 -0000 1.14
***************
*** 37,41 ****
#include <string>
#include <map>
! #include <iostream.h>
#include "data/epp_Response.h"
--- 37,41 ----
#include <string>
#include <map>
! #include <iostream>
#include "data/epp_Response.h"
***************
*** 82,86 ****
* @param returnType The return type (e.g., "creData")
*/
! void printResDataHeaders(const string & object, const string & returntype);
/** Function that writes to cerr a standard resData footer
--- 82,86 ----
* @param returnType The return type (e.g., "creData")
*/
! void printResDataHeaders(const std::string & object, const std::string & returntype);
/** Function that writes to cerr a standard resData footer
***************
*** 88,92 ****
* @param returnType The return type (e.g., "creData")
*/
! void printResDataFooter(const string & object, const string & returntype);
/** Function that handles the command line arguments sent to the program
--- 88,92 ----
* @param returnType The return type (e.g., "creData")
*/
! void printResDataFooter(const std::string & object, const std::string & returntype);
/** Function that handles the command line arguments sent to the program
***************
*** 101,105 ****
bool handleArgs(eppobject::epp::epp_Session & sess,
int argc, char * argv[],
! string & username, string & password);
/** Function that tries to login to a server using information in the
--- 101,105 ----
bool handleArgs(eppobject::epp::epp_Session & sess,
int argc, char * argv[],
! std::string & username, std::string & password);
/** Function that tries to login to a server using information in the
***************
*** 110,115 ****
*/
void testLogIn(eppobject::epp::epp_Session & mySession,
! const string & username,
! const string & password);
/** Function that takes a testdata string and puts each quoted element
--- 110,115 ----
*/
void testLogIn(eppobject::epp::epp_Session & mySession,
! const std::string & username,
! const std::string & password);
/** Function that takes a testdata string and puts each quoted element
***************
*** 118,122 ****
* @return Map of testdata elements
*/
! map<unsigned int,string> getTestDataMap(const string & testdata);
#endif
--- 118,122 ----
* @return Map of testdata elements
*/
! std::map<unsigned int,std::string> getTestDataMap(const std::string & testdata);
#endif
|
|
From: Daniel M. <tub...@us...> - 2003-04-28 20:51:22
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/unspec
In directory sc8-pr-cvs1:/tmp/cvs-serv32286/unspec
Modified Files:
epp_UnspecTest.h
Log Message:
updates to the source for gcc 3.x compliant namespaces (std::string, etc...)
Index: epp_UnspecTest.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/unspec/epp_UnspecTest.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** epp_UnspecTest.h 14 Mar 2002 19:06:46 -0000 1.6
--- epp_UnspecTest.h 28 Apr 2003 20:51:13 -0000 1.7
***************
*** 88,92 ****
if(!todayNode->isNull())
{
! string today = todayNode->getNodeData();
m_weather->m_today.ref(new epp_string(today));
}
--- 88,92 ----
if(!todayNode->isNull())
{
! std::string today = todayNode->getNodeData();
m_weather->m_today.ref(new epp_string(today));
}
***************
*** 95,99 ****
if(!tomorrowNode->isNull())
{
! string tomorrow = tomorrowNode->getNodeData();
m_weather->m_tomorrow.ref(new epp_string(tomorrow));
}
--- 95,99 ----
if(!tomorrowNode->isNull())
{
! std::string tomorrow = tomorrowNode->getNodeData();
m_weather->m_tomorrow.ref(new epp_string(tomorrow));
}
|
|
From: Daniel M. <tub...@us...> - 2003-04-28 20:51:21
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv32286/transport
Modified Files:
epp_TransportBase.h epp_TransportConn.h
epp_TransportIOStream.cc epp_TransportIOStream.h
epp_TransportSSL.cc epp_TransportSSL.h epp_TransportTCP.cc
epp_TransportTCP.h
Log Message:
updates to the source for gcc 3.x compliant namespaces (std::string, etc...)
Index: epp_TransportBase.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportBase.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** epp_TransportBase.h 17 Jul 2002 11:50:17 -0000 1.7
--- epp_TransportBase.h 28 Apr 2003 20:51:09 -0000 1.8
***************
*** 45,49 ****
protected:
! string m_type; /**< Transport type */
public:
--- 45,49 ----
protected:
! std::string m_type; /**< Transport type */
public:
***************
*** 60,68 ****
/// Abstract function, writing data to server
/// @param xml_string Data to write to server
! virtual void writeToServer(const string & xml_string) = 0;
/// Abstract function, reading data from server
/// @return Data read from server
! virtual string readFromServer() = 0;
/// Connects to server
--- 60,68 ----
/// Abstract function, writing data to server
/// @param xml_string Data to write to server
! virtual void writeToServer(const std::string & xml_string) = 0;
/// Abstract function, reading data from server
/// @return Data read from server
! virtual std::string readFromServer() = 0;
/// Connects to server
***************
*** 82,94 ****
/// Returning the name of the server
/// @return Server name
! virtual string getServerName() { return "";};
/// Setting the name of the server
/// @param serverName Server name
! virtual void setServerName(const string &) {};
/// Returning type of transport
/// @return Transport type
! virtual string getType() const
{
return m_type;
--- 82,94 ----
/// Returning the name of the server
/// @return Server name
! virtual std::string getServerName() { return "";};
/// Setting the name of the server
/// @param serverName Server name
! virtual void setServerName(const std::string &) {};
/// Returning type of transport
/// @return Transport type
! virtual std::string getType() const
{
return m_type;
***************
*** 100,107 ****
/// Exception class containing information about errors encountered in transport handling
! class epp_TrException : public exception {
public:
! string m_error_message; /**< Text describing the encountered error */
/// Null constructor
--- 100,107 ----
/// Exception class containing information about errors encountered in transport handling
! class epp_TrException : public std::exception {
public:
! std::string m_error_message; /**< Text describing the encountered error */
/// Null constructor
***************
*** 109,116 ****
/// Destructor
! virtual ~epp_TrException() {};
/// Constructor with error data
! epp_TrException(const string & data)
{
m_error_message = data;
--- 109,116 ----
/// Destructor
! virtual ~epp_TrException() throw() {};
/// Constructor with error data
! epp_TrException(const std::string & data)
{
m_error_message = data;
***************
*** 119,123 ****
/// Returns the error string
/// @deprecated Access the data directly instead
! virtual string getString() const
{
return m_error_message;
--- 119,123 ----
/// Returns the error string
/// @deprecated Access the data directly instead
! virtual std::string getString() const
{
return m_error_message;
***************
*** 125,129 ****
/// Constructor with error data, file name, and line number
! epp_TrException(const string & file, const int lineno, const string & data)
{
char buf[10];
--- 125,129 ----
/// Constructor with error data, file name, and line number
! epp_TrException(const std::string & file, const int lineno, const std::string & data)
{
char buf[10];
Index: epp_TransportConn.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportConn.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** epp_TransportConn.h 17 Jul 2002 11:50:17 -0000 1.8
--- epp_TransportConn.h 28 Apr 2003 20:51:10 -0000 1.9
***************
*** 45,49 ****
protected:
! string m_serverName; /**< The name of the server to connect to */
unsigned long m_serverPort; /**< The port of the server to connect to */
--- 45,49 ----
protected:
! std::string m_serverName; /**< The name of the server to connect to */
unsigned long m_serverPort; /**< The port of the server to connect to */
***************
*** 64,68 ****
/// @param serverName Name of server
/// @param serverPort Port of server
! virtual void connect(const string & serverName,
const unsigned long & serverPort) = 0;
--- 64,68 ----
/// @param serverName Name of server
/// @param serverPort Port of server
! virtual void connect(const std::string & serverName,
const unsigned long & serverPort) = 0;
***************
*** 76,80 ****
/// @return IP address of server
/// @deprecated Use getServerName() instead
! virtual string getServerIP()
{
return m_serverName;
--- 76,80 ----
/// @return IP address of server
/// @deprecated Use getServerName() instead
! virtual std::string getServerIP()
{
return m_serverName;
***************
*** 84,88 ****
/// @param serverIP IP address of server
/// @deprecated Use setServerName() instead
! virtual void setServerIP(const string & serverIP)
{
m_serverName = serverIP;
--- 84,88 ----
/// @param serverIP IP address of server
/// @deprecated Use setServerName() instead
! virtual void setServerIP(const std::string & serverIP)
{
m_serverName = serverIP;
***************
*** 105,109 ****
/// Returning the name of the server
/// @return Name of server
! virtual string getServerName()
{
return m_serverName;
--- 105,109 ----
/// Returning the name of the server
/// @return Name of server
! virtual std::string getServerName()
{
return m_serverName;
***************
*** 112,116 ****
/// Setting the name of the server
/// @param serverName Name of server
! virtual void setServerName(const string & serverName)
{
m_serverName = serverName;
--- 112,116 ----
/// Setting the name of the server
/// @param serverName Name of server
! 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** epp_TransportIOStream.cc 17 Jul 2002 11:50:17 -0000 1.7
--- epp_TransportIOStream.cc 28 Apr 2003 20:51:11 -0000 1.8
***************
*** 35,38 ****
--- 35,39 ----
+ 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.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** epp_TransportIOStream.h 17 Jul 2002 11:50:17 -0000 1.5
--- epp_TransportIOStream.h 28 Apr 2003 20:51:12 -0000 1.6
***************
*** 57,65 ****
/// Writing data to cout
/// @param xml_string Data to write to cout
! void writeToServer(const string & xml_string);
/// Reading data from cin
/// @return Data read from cin
! string readFromServer();
};
--- 57,65 ----
/// Writing data to cout
/// @param xml_string Data to write to cout
! void writeToServer(const std::string & xml_string);
/// Reading data from cin
/// @return Data read from cin
! std::string readFromServer();
};
Index: epp_TransportSSL.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** epp_TransportSSL.cc 23 Jan 2003 10:42:04 -0000 1.18
--- epp_TransportSSL.cc 28 Apr 2003 20:51:12 -0000 1.19
***************
*** 46,49 ****
--- 46,50 ----
+ using namespace std;
using namespace epptransport;
using namespace npbase;
Index: epp_TransportSSL.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** epp_TransportSSL.h 17 Jul 2002 11:50:17 -0000 1.13
--- epp_TransportSSL.h 28 Apr 2003 20:51:12 -0000 1.14
***************
*** 47,53 ****
private:
! string m_certFile; /**< SSL certificate file location */
! string m_cacertFile; /**< Certificate authority filename */
! string m_cacertDir; /**< Certificate authority directory */
npbase::npssl *sslserver; /**< SSL server handler */
--- 47,53 ----
private:
! std::string m_certFile; /**< SSL certificate file location */
! std::string m_cacertFile; /**< Certificate authority filename */
! std::string m_cacertDir; /**< Certificate authority directory */
npbase::npssl *sslserver; /**< SSL server handler */
***************
*** 67,73 ****
/// Constructor with certificate file locations
! epp_TransportSSL(const string & certFile,
! const string & cacertFile = "",
! const string & cacertDir = "")
{
m_type="epp_TransportSSL";
--- 67,73 ----
/// Constructor with certificate file locations
! epp_TransportSSL(const std::string & certFile,
! const std::string & cacertFile = "",
! const std::string & cacertDir = "")
{
m_type="epp_TransportSSL";
***************
*** 93,97 ****
/// @throw epp_TrException If it is not connected to the server
/// @throw epp_TrException If it is unable write to server
! void writeToServer(const string & xml_string);
/// Reading data from server
--- 93,97 ----
/// @throw epp_TrException If it is not connected to the server
/// @throw epp_TrException If it is unable write to server
! void writeToServer(const std::string & xml_string);
/// Reading data from server
***************
*** 99,108 ****
/// @throw epp_TrException If it is not connected to the server
/// @throw epp_TrException If it is unable to read from server
! string readFromServer();
/// Connecting to server by setting server name and server port and then calling #connect()
/// @param serverName Name of server
/// @param serverPort Port of server
! void connect(const string & serverName, const unsigned long & serverPort);
/// Connecting to server by setting server name/port and certificate files and then calling #connect()
--- 99,108 ----
/// @throw epp_TrException If it is not connected to the server
/// @throw epp_TrException If it is unable to read from server
! std::string readFromServer();
/// Connecting to server by setting server name and server port and then calling #connect()
/// @param serverName Name of server
/// @param serverPort Port of server
! void connect(const std::string & serverName, const unsigned long & serverPort);
/// Connecting to server by setting server name/port and certificate files and then calling #connect()
***************
*** 112,120 ****
/// @param cacertFile Certificate authority filename
/// @param cacertDir Certificate authority directory
! void connect(const string & serverName,
const unsigned long & serverPort,
! const string & certFile,
! const string & cacertFile = "",
! const string & cacertDir = "");
/// Connects to server
--- 112,120 ----
/// @param cacertFile Certificate authority filename
/// @param cacertDir Certificate authority directory
! void connect(const std::string & serverName,
const unsigned long & serverPort,
! const std::string & certFile,
! const std::string & cacertFile = "",
! const std::string & cacertDir = "");
/// Connects to server
***************
*** 130,134 ****
/// Returning the location of the SSL certificate file
/// @return Location of the SSL certificate file
! string getCertFile() const
{
return m_certFile;
--- 130,134 ----
/// Returning the location of the SSL certificate file
/// @return Location of the SSL certificate file
! std::string getCertFile() const
{
return m_certFile;
***************
*** 137,141 ****
/// Setting the location of the SSL certificate file
/// @param certFile Location of the SSL certificate file
! void setCertFile(const string & certFile)
{
m_certFile = certFile;
--- 137,141 ----
/// Setting the location of the SSL certificate file
/// @param certFile Location of the SSL certificate file
! void setCertFile(const std::string & certFile)
{
m_certFile = certFile;
***************
*** 144,148 ****
/// Returning the filename of the certificate authority file
/// @return Filename of the certificate authority file
! string getCACertFile() const
{
return m_cacertFile;
--- 144,148 ----
/// Returning the filename of the certificate authority file
/// @return Filename of the certificate authority file
! std::string getCACertFile() const
{
return m_cacertFile;
***************
*** 151,155 ****
/// Setting the filename of the certificate authority file
/// @param cacertFile Filename of the certificate authority file
! void setCACertFile(const string & cacertFile)
{
m_cacertFile = cacertFile;
--- 151,155 ----
/// Setting the filename of the certificate authority file
/// @param cacertFile Filename of the certificate authority file
! void setCACertFile(const std::string & cacertFile)
{
m_cacertFile = cacertFile;
***************
*** 158,162 ****
/// Returning the directory of the certificate authority file
/// @return Directory of the certificate authority file
! string getCACertDir() const
{
return m_cacertDir;
--- 158,162 ----
/// Returning the directory of the certificate authority file
/// @return Directory of the certificate authority file
! std::string getCACertDir() const
{
return m_cacertDir;
***************
*** 165,169 ****
/// Setting the directory of the certificate authority file
/// @param cacertDir Directory of the certificate authority file
! void setCACertDir(const string & cacertDir)
{
m_cacertDir = cacertDir;
--- 165,169 ----
/// Setting the directory of the certificate authority file
/// @param cacertDir Directory of the certificate authority file
! void setCACertDir(const std::string & cacertDir)
{
m_cacertDir = cacertDir;
Index: epp_TransportTCP.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportTCP.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** epp_TransportTCP.cc 17 Jul 2002 11:50:17 -0000 1.6
--- epp_TransportTCP.cc 28 Apr 2003 20:51:12 -0000 1.7
***************
*** 46,50 ****
#include <netdb.h>
!
using namespace epptransport;
--- 46,50 ----
#include <netdb.h>
! using namespace std;
using namespace epptransport;
Index: epp_TransportTCP.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportTCP.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** epp_TransportTCP.h 17 Jul 2002 11:50:17 -0000 1.4
--- epp_TransportTCP.h 28 Apr 2003 20:51:13 -0000 1.5
***************
*** 81,89 ****
/// @param xml_string Data to write to server
/// @throw epp_TrException If it cannot write to server
! void writeToServer(const string & xml_string);
/// Reading data from server
/// @return Data read from server
! string readFromServer();
/// Selects type of operation (READ/WRITE)
--- 81,89 ----
/// @param xml_string Data to write to server
/// @throw epp_TrException If it cannot write to server
! void writeToServer(const std::string & xml_string);
/// Reading data from server
/// @return Data read from server
! std::string readFromServer();
/// Selects type of operation (READ/WRITE)
***************
*** 96,100 ****
/// @param serverName Name of server
/// @param serverPort Port of server
! void connect(const string & serverName, const unsigned long & serverPort);
/// Connects to server
--- 96,100 ----
/// @param serverName Name of server
/// @param serverPort Port of server
! void connect(const std::string & serverName, const unsigned long & serverPort);
/// Connects to server
|
|
From: Daniel M. <tub...@us...> - 2003-04-28 20:49:36
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src In directory sc8-pr-cvs1:/tmp/cvs-serv31517/src Modified Files: Makefile.am Log Message: added -I/usr/local/openssl and -I/usr/local/xerces/include/xercesc and defining PERL5 so that the openssl 0.9.6x declaration of crypt() doesn't appear because it interferes with the one from unistd.h in RedHat 9 Index: Makefile.am =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.am 12 Mar 2002 20:46:56 -0000 1.7 --- Makefile.am 28 Apr 2003 20:49:30 -0000 1.8 *************** *** 53,57 **** LDADD = $(common_lib) -L/usr/local/lib/domtools \ -ldomtools /usr/local/xerces/lib/libxerces.so -lpthread \ ! -L/usr/local/ssl/lib -lssl -lcrypt -lcrypto common = \ --- 53,57 ---- LDADD = $(common_lib) -L/usr/local/lib/domtools \ -ldomtools /usr/local/xerces/lib/libxerces.so -lpthread \ ! -L/usr/local/ssl/lib -L/usr/local/openssl/lib -lssl -lcrypt -lcrypto common = \ |
|
From: Daniel M. <tub...@us...> - 2003-04-28 20:49:35
|
Update of /cvsroot/epp-rtk/epp-rtk/c++ In directory sc8-pr-cvs1:/tmp/cvs-serv31517 Modified Files: configure.in Log Message: added -I/usr/local/openssl and -I/usr/local/xerces/include/xercesc and defining PERL5 so that the openssl 0.9.6x declaration of crypt() doesn't appear because it interferes with the one from unistd.h in RedHat 9 Index: configure.in =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** configure.in 18 Mar 2002 11:08:56 -0000 1.7 --- configure.in 28 Apr 2003 20:49:29 -0000 1.8 *************** *** 25,29 **** #If the following line does not work, try AC_LANG(C++) instead AC_LANG_CPLUSPLUS ! CPPFLAGS="-I/usr/include -I/usr/local/include/ -I/usr/local/xerces" CXXFLAGS="--ansi -Wall -g -O2" #AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h) --- 25,32 ---- #If the following line does not work, try AC_LANG(C++) instead AC_LANG_CPLUSPLUS ! # we're defining PERL5 as a cheat to prevent ! # openssl 0.9.6x from conflicting with unistd.h ! # in RedHat9 ! CPPFLAGS="-I/usr/local/openssl/include -I/usr/include -I/usr/local/include/ -I/usr/local/xerces -I/usr/local/xerces/include/xercesc -DPERL5" CXXFLAGS="--ansi -Wall -g -O2" #AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h) |
|
From: Daniel M. <tub...@us...> - 2003-04-21 22:39:06
|
Update of /cvsroot/epp-rtk/epp-rtk/c/sample/epp0705
In directory sc8-pr-cvs1:/tmp/cvs-serv1080
Added Files:
Makefile README client.conf epp-client.c epp-client.h
Log Message:
copied the old sample code into a directory for epp0705
--- NEW FILE: Makefile ---
OPENSSLDIR=/usr/local/ssl
CC=gcc
# the libxml includes are found in libxml2 on
# modern systems such as RedHat 8
CFLAGS=-Wall -g -I$(OPENSSLDIR)/include -I/usr/include/libxml2
LIBS=-L$(OPENSSLDIR)/lib -lxml2 -lssl -lcrypto -ldl
epp-client: epp-client.c
$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
clean:
$(RM) *.o core epp-client
--- NEW FILE: README ---
This program demonstrates the use of different C packages that can be used to
communicate with the dot info registry. Gnome-xml is used to parse and create
xml commands sent to and received from the server. Openssl is used to make
the secure connection to the server which is a requirement.
In order for the sample to work, the client needs a certificate file so the
server can authenticate the client and establish a connection. It also
requires a key file and a certificate authority file. The three files
must be in PEM format and the filenames are specified in the client.conf
file. The cert file must be authenticated by a recognized certificate
authority in order for the server to accept it.
To compile the code take a look at the Makefile (which is pretty short),
and make adjustments as necessary. Then "make".
This sample was develop on RedHat Linux 6.2 and also tested on RH 7.1.
Currently, there is no automake since there's only one .c and one .h.
Once compiled, the sample can be run by typing ./epp-client 'domain name' at
the command prompt. If successful (certs and key are ok and the connection
info checks out) it will return information from the server greeting and show
the results of each command.
--- NEW FILE: client.conf ---
<clientConf>
<remoteHost>localhost</remoteHost>
<remotePort>50070</remotePort>
<username>ClientX</username>
<password>foo-BAR2</password>
<pemprivatekey>/usr/share/ssl/certs/epp-key.pem</pemprivatekey>
<pemcert>/usr/share/ssl/certs/epp-cert.pem</pemcert>
<pemcacert>/usr/share/ssl/certs/cacert.pem</pemcacert>
</clientConf>
--- NEW FILE: epp-client.c ---
/*
Epp Client Example
This sample is intended to show the basic use of different c packages create and send commands
to the epp registry.
Compiled and tested on linux using the latest version of libxml which can be found
at www.xmlsoft.org. Windows version can be found at http://www.ce.berkeley.edu/~doolin/code/libxmlwin32/
This sample uses gnome-xml to create commands and parse the results sent back from the server.
Openssl is used to make the secure connection to the epp server. The latest version can be downloaded from
www.openssl.org.
The commands shown are: 'login', 'domain create', 'domain ping', 'domain info', 'domain delete',
and 'logout'.
The client.conf file is used to store the remote host name, the remote host port, and the
username and password for login.
The program is executed by typing ./epp-client 'domain name' at the command prompt. Each command
will be sent to the server and the result will be shown.
*/
#define EPP_HEADER_SIZE 4
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <time.h>
#include <sys/types.h>
#include <sys/time.h>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
#include <openssl/crypto.h>
#include <openssl/x509.h>
#include "epp-client.h"
const char *conf_file = "client.conf";
struct xml_conf *remote;
/* Function to read and parse configuration file for client settings */
void readConfiguration(void)
{
xmlDocPtr doc;
xmlNodePtr cur;
doc = xmlParseFile(conf_file);
if(doc == NULL)
{
fprintf(stderr, "Error parsing configuration file\n");
exit(1);
}
/* Put some memory aside for a config structure */
remote = (struct xml_conf *)malloc(sizeof(struct xml_conf));
if(remote == NULL)
{
fprintf(stderr, "Out of memory\n");
xmlFreeDoc(doc);
exit(1);
}
memset(remote, 0, sizeof(struct xml_conf));
cur = xmlDocGetRootElement(doc);
cur = cur->xmlChildrenNode;
/* Get the info required from the conf file */
while(cur != NULL)
{
if((!strcmp(cur->name, "remoteHost")))
remote->remoteHost = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if((!strcmp(cur->name, "remotePort")))
remote->remotePort = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if((!strcmp(cur->name, "username")))
remote->username = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if((!strcmp(cur->name, "password")))
remote->password = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if((!strcmp(cur->name, "pemprivatekey")))
remote->pemprivatekey = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if((!strcmp(cur->name, "pemcert")))
remote->pemcert = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
if((!strcmp(cur->name, "pemcacert")))
remote->pemcacert = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
cur = cur->next;
}
xmlFreeDoc(doc);
return;
}
/* Function to handle communication between client and server */
void handleConnection(char *param)
{
int i, err;
char *buf;
char *host_port;
char *commands [4] = {"create", "check", "info", "delete"};
char *xml_command;
char *xml_login;
struct greeting_message *greeting;
struct server_message *serverMessage;
xmlDocPtr xml_stream;
xmlNsPtr ns;
xmlNodePtr cur;
SSL_CTX *ctx;
SSL *ssl;
SSL_METHOD *meth;
BIO *out;
BIO *ssl_bio;
/* SSL stuff */
OpenSSL_add_ssl_algorithms();
meth = SSLv3_client_method();
ctx = SSL_CTX_new(meth);
CHK_NULL(ctx);
SSL_CTX_set_cipher_list(ctx,getenv("SSL_CIPHER"));
err = SSL_CTX_use_certificate_file(ctx, remote->pemcert, SSL_FILETYPE_PEM);
CHK_SSL(err);
err = SSL_CTX_use_PrivateKey_file(ctx, remote->pemprivatekey, SSL_FILETYPE_PEM);
CHK_SSL(err);
/*
err = SSL_CTX_load_verify_locations(ctx, remote->pemcacert, NULL);
CHK_SSL(err);
*/
err = SSL_CTX_set_default_verify_paths(ctx);
CHK_SSL(err);
SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL);
ssl = SSL_new(ctx);
CHK_NULL(ssl);
SSL_set_connect_state(ssl);
ssl_bio = BIO_new(BIO_f_ssl());
BIO_set_ssl(ssl_bio, ssl, BIO_NOCLOSE);
host_port = (char *)malloc(sizeof(char) * 100);
memset(host_port, '\0', 100);
sprintf(host_port, "%s:%s", remote->remoteHost,remote->remotePort);
printf("%s:%s\n", remote->remoteHost,remote->remotePort);
out = BIO_new(BIO_s_connect());
BIO_set_conn_hostname(out, host_port);
BIO_set_nbio(out, 1);
out = BIO_push(ssl_bio, out);
/* When connection is made the server sends greeting message
First get the greeting message, parse it and login. */
buf = receiveData(out);
/* Initialize gnome-xml parser */
initializeXML(&xml_stream, &ns, &cur, buf);
parseServerGreeting(&xml_stream, &cur, &greeting);
printf("%s\n", greeting->server);
printf("%s\n\n", greeting->date);
/* Build the login xml structure to send to server */
xml_login = buildLoginXML();
printf("Sending login message...\n");
sendData(out, xml_login);
printf("Response from server\n");
/* Receive the login response from server and parse. */
buf = receiveData(out);
initializeXML(&xml_stream, &ns, &cur, buf);
if(parseServerMessage(&xml_stream, &cur, &serverMessage) == -1)
{
printf("Error: %s\n code: %d\n", serverMessage->message_text, serverMessage->response_code);
exit(1);
}
/* show message from server */
printf("Response text: %s\n", serverMessage->message_text);
printf("Response code: %d\n\n", serverMessage->response_code);
/* Now we can send commands for create, ping, info, and delete. */
for (i = 0; i < 4; i++)
{
printf("Sending domain %s command...\n", commands[i]);
/* Create the command xml structure */
xml_command = buildCommandXML(commands[i], param);
sendData(out, xml_command);
/* Receive and parse server message. */
buf = receiveData(out);
initializeXML(&xml_stream, &ns, &cur, buf);
if(parseServerMessage(&xml_stream, &cur, &serverMessage) == -1)
{
printf("Error: %s\n code: %d\n", serverMessage->message_text, serverMessage->response_code);
break;
}
/* Show message from server */
printf("Results for domain %s command:\n", commands[i]);
printf("Response text: %s\n", serverMessage->message_text);
printf("Response code: %d\n", serverMessage->response_code);
printf("\n");
}
/* Now logout */
xml_command = buildCommandXML("logout", NULL);
sendData(out, xml_command);
BIO_free_all(out);
if(ctx != NULL) SSL_CTX_free(ctx);
exit(0);
}
/* Function to receive data from the server */
char *receiveData (BIO *out)
{
char *XMLData = NULL;
int XMLDataSize = 0;
int bytesRead = 0;
int count = 0;
int totalBytesRead = 0;
char buf[MAXDATASIZE];
/* Allocate memory for the data pointer. */
XMLDataSize = MAXDATASIZE * 3;
XMLData = (char *)malloc (sizeof (char) * XMLDataSize);
memset (XMLData, '\0', XMLDataSize);
int bytesToRead = 0;
unsigned char headerByte;
/* Start slurping data from the socket. */
for(;;)
{
bytesRead = BIO_read(out, &headerByte, 1);
if(bytesRead == 0) break;
/* If we know something is supposed to be there then keep trying. */
if(bytesRead < 0)
{
/* It might be better to use BIO_should_read() and a select() to wait
on a socket, but this will work */
if(BIO_should_retry(out))
{
fprintf(stderr, "header read DELAY\n");
sleep(2);
count++;
/* If we have to try more than 6 times, then give up */
if(count > 6)
{
BIO_free_all(out);
fprintf(stderr, "There was an error reading from the socket\n");
exit(1);
}
continue;
}
}
totalBytesRead += bytesRead;
/* shift the bytes over because the header is a 4-byte big-endian number. */
bytesToRead = bytesToRead | ( headerByte << 8 * (EPP_HEADER_SIZE - totalBytesRead) );
if ( totalBytesRead == EPP_HEADER_SIZE ) {
break;
}
}
/* the length of the XML message includes the 4 bytes in the header */
bytesToRead -= 4;
printf("The EPP XML header size: [%u]\n", bytesToRead);
totalBytesRead = 0;
bytesRead = 0;
/* Start slurping data from the socket. */
for(;;)
{
memset(buf, '\0', MAXDATASIZE);
bytesRead = BIO_read(out, buf, sizeof(buf));
printf("number bytes read from the stream: [%d]\n", bytesRead);
if(bytesRead == 0) break;
/* If we know something is supposed to be there then keep trying. */
if(bytesRead < 0)
{
/* It might be better to use BIO_should_read() and a select() to wait
on a socket, but this will work */
if(BIO_should_retry(out))
{
fprintf(stderr, "read DELAY\n");
sleep(2);
count++;
/* If we have to try more than 6 times, then give up */
if(count > 6)
{
BIO_free_all(out);
fprintf(stderr, "There was an error reading from the socket\n");
exit(1);
}
continue;
}
}
totalBytesRead += bytesRead;
strcat(XMLData, buf);
XMLData[totalBytesRead] = '\0';
if ( totalBytesRead == bytesToRead ) {
/* we've read all we have to */
break;
}
}
return XMLData;
}
/* Function to send data to the server */
void sendData(BIO *out, char *pBuf)
{
int bytesWritten = 0;
for(;;)
{
bytesWritten = BIO_write(out, pBuf, strlen(pBuf));
if(bytesWritten > 0) break;
if(bytesWritten <= 0)
{
if(BIO_should_retry(out))
{
/* fprintf(stderr, "write DELAY\n"); */
sleep(1);
continue;
}
}
}
}
/* General function to parse server messages and set values in the server_message struct
Returns the server response code or -1 if there is an error */
int parseServerMessage(xmlDoc **xml_stream, xmlNode **cur, struct server_message **serverMessage)
{
/* Put some memory aside for a server xml structure */
(*serverMessage) = (struct server_message *)malloc(sizeof(struct server_message));
if((*serverMessage) == NULL)
{
fprintf(stderr, "Out of memory\n");
xmlFreeDoc((*xml_stream));
exit(1);
}
memset((*serverMessage), 0, sizeof(struct server_message));
/* The rest does the actual parsing... */
/* Move 2 levels deeper in xml */
(*cur) = (*cur)->xmlChildrenNode;
(*cur) = (*cur)->xmlChildrenNode;
/* Now start getting the information
Step through each node on this level to find the ones required */
while((*cur) != NULL)
{
if((!strcmp((*cur)->name, "result")))
(*serverMessage)->response_code = atoi(xmlGetProp((*cur), "code"));
(*serverMessage)->message_text = xmlNodeGetContent((*cur));
(*cur) = (*cur)->next;
}
/* Free the structures from memory */
xmlFreeNodeList((*cur));
xmlFreeDoc((*xml_stream));
if(!SUCCESS((*serverMessage)->response_code))
{
return -1;
}
else
{
return (*serverMessage)->response_code;
}
}
/* Initialize the xml parser */
void initializeXML(xmlDoc **xml_stream, xmlNs **ns, xmlNode **cur, char *message)
{
printf("the xml sent to us [%s]\n", message);
/* Parse the document in memory */
(*xml_stream) = xmlParseDoc(message);
/* Point the pointer at the root */
(*cur) = xmlDocGetRootElement((*xml_stream));
/* Check the namespace of the document */
(*ns) = xmlSearchNsByHref((*xml_stream), (*cur),
(const xmlChar *) NAMESPACE);
if((*ns) == NULL)
{
fprintf(stderr, "Document of wrong type\n");
xmlFreeDoc((*xml_stream));
exit(1);
}
while((*cur) && xmlIsBlankNode((*cur)))
{
(*cur) = (*cur)->next;
}
}
/* Build the command xml for domain objects to send to server */
char *buildCommandXML(const char *command, const char *param)
{
xmlChar *xml_command;
int length;
xmlDocPtr doc;
xmlNodePtr tree, subtree, subsubtree;
char *object;
object = (char *)malloc(sizeof(char) * 20);
memset(object, '\0', 20);
sprintf(object, "domain:%s", command);
/* Build an xml document using gnome-xml */
doc = xmlNewDoc("1.0");
doc->children = xmlNewDocNode(doc, NULL, "epp", NULL);
xmlSetProp(doc->children, "xmlns", "urn:iana:xml:ns:epp");
xmlSetProp(doc->children, "xmlns:xsi", NAMESPACE);
xmlSetProp(doc->children, "xsi:schemaLocation", "urn:iana:xml:ns:epp epp.xsd");
tree = xmlNewChild(doc->children, NULL, "command", NULL);
subtree = xmlNewChild(tree, NULL, command, NULL);
subsubtree = xmlNewChild(subtree, NULL, object, NULL);
xmlSetProp(subsubtree, "xmlns:domain", "urn:iana:xmlns:domain");
xmlSetProp(subsubtree, "xsi:schemaLocation", "urn:iana:xmlns:domain domain.xsd");
subtree = xmlNewChild(subsubtree, NULL, "domain:name", param);
subtree = xmlNewChild(subsubtree, NULL, "domain:authInfo", "jerome");
xmlDocDumpMemory(doc, &xml_command, &length);
xmlFreeDoc(doc);
return (xml_command);
}
/* Build the login xml to send */
char *buildLoginXML(void)
{
xmlChar *xml_login;
int length;
xmlDocPtr doc;
xmlNodePtr tree, subtree, subsubtree;
doc = xmlNewDoc("1.0");
doc->children = xmlNewDocNode(doc, NULL, "epp", NULL);
xmlSetProp(doc->children, "xml:ns", "urn:iana:xmlns:epp");
xmlSetProp(doc->children, "xmlns:xsi", NAMESPACE);
xmlSetProp(doc->children, "xsi:schemaLocation", "urn:iana:xml:ns:epp epp.xsd");
tree = xmlNewChild(doc->children, NULL, "command", NULL);
subtree = xmlNewChild(tree, NULL, "creds", NULL);
subsubtree = xmlNewChild(subtree, NULL, "clID", remote->username);
subsubtree = xmlNewChild(subtree, NULL, "pw", remote->password);
subsubtree = xmlNewChild(subtree, NULL, "options", NULL);
subtree = xmlNewChild(subsubtree, NULL, "lang", "en");
subtree = xmlNewChild(subsubtree, NULL, "version", "1.0");
subtree = xmlNewChild(tree, NULL, "login", NULL);
subsubtree = xmlNewChild(subtree, NULL, "svcs", NULL);
subtree = xmlNewChild(subsubtree, NULL, "domain:svc", NULL);
xmlSetProp(subtree, "xmlns:domain", "urn:iana:xml:ns:domain");
xmlSetProp(subtree, "xsi:schemaLocation", "urn:iana:xml:ns:domain domain.xsd");
subtree = xmlNewChild(subsubtree, NULL, "host:svc", NULL);
xmlSetProp(subtree, "xmlns:host", "urn:iana:xml:ns:host");
xmlSetProp(subtree, "xsi:schemaLocation", "urn:iana:xml:ns:host host.xsd");
subtree = xmlNewChild(subsubtree, NULL, "contact:svc", NULL);
xmlSetProp(subtree, "xmlns:contact", "urn:iana:xml:ns:contact");
xmlSetProp(subtree, "xsi:schemaLocation", "urn:iana:xml:ns:contact contact.xsd");
subtree = xmlNewChild(tree, NULL, "clTRID", "ABL:Client:123");
xmlDocDumpMemory(doc, &xml_login, &length);
xmlFreeDoc(doc);
return (xml_login);
}
/* Function to parse the server greeting
Parses the server name and date from xml and stores result in greeting_message struct */
void parseServerGreeting(xmlDoc **xml_stream, xmlNode **cur, struct greeting_message **greeting)
{
/* Put some memory aside for a greeting structure */
(*greeting) = (struct greeting_message *)malloc(sizeof(struct greeting_message));
if((*greeting) == NULL)
{
fprintf(stderr, "Out of memory\n");
xmlFreeDoc((*xml_stream));
exit(1);
}
memset((*greeting), 0, sizeof(struct greeting_message));
(*cur) = (*cur)->xmlChildrenNode;
(*cur) = (*cur)->xmlChildrenNode;
while(((*cur) != NULL) && ((*cur)->name != NULL))
{
if((!strcmp((*cur)->name, "svID")))
(*greeting)->server = xmlNodeListGetString((*xml_stream), (*cur)->xmlChildrenNode, 1);
if((!strcmp((*cur)->name, "svDate")))
(*greeting)->date = xmlNodeListGetString((*xml_stream), (*cur)->xmlChildrenNode, 1);
(*cur) = (*cur)->next;
}
xmlFreeNodeList((*cur));
xmlFreeDoc((*xml_stream));
}
int main(int argc, char **argv)
{
/* Check the args */
if(argc != 2)
{
fprintf(stderr, "Usage: ./epp-client 'domain name'\n");
exit(1);
}
/* Get the configuration details from the conf file */
readConfiguration();
handleConnection(argv[1]);
return 0;
}
--- NEW FILE: epp-client.h ---
#define NAMESPACE "http://www.w3.org/2000/10/XMLSchema-instance"
#define COMMAND_SUCCESSFUL 1000
#define COMMAND_SUCCESSFUL_END 1500
#define SUCCESS(X) (X == COMMAND_SUCCESSFUL || X == COMMAND_SUCCESSFUL_END)
#define MAXDATASIZE 1000
#define CHK_NULL(x) if ((x)==NULL) exit (1)
#define CHK_ERR(err,s) if ((err)==-1) { perror(s); exit(1); }
#define CHK_SSL(err) if ((err)==-1) { ERR_print_errors_fp(stderr); exit(2); }
/* Structure for client configuration */
struct xml_conf
{
char *remoteHost;
char *remotePort;
char *username;
char *password;
char *pemprivatekey;
char *pemcert;
char *pemcacert;
};
/* Server greeting message */
struct greeting_message
{
char *server;
char *date;
};
/* Server response message */
struct server_message
{
char *message_text;
int response_code;
};
void parseServerGreeting(xmlDoc **xml_stream, xmlNode **cur, struct greeting_message **greeting);
void readConfiguration(void);
char *buildLoginXML(void);
void handleConnection(char *param);
void initializeXML (xmlDoc **xml_stream, xmlNs **ns, xmlNode **cur, char *message);
int parseServerMessage(xmlDoc **xml_stream, xmlNode **cur, struct server_message **serverMessage);
char *buildCommandXML(const char *command, const char *param);
char *receiveData (BIO *out);
void sendData(BIO *out, char *pBuf);
|
|
From: Daniel M. <tub...@us...> - 2003-04-21 22:37:55
|
Update of /cvsroot/epp-rtk/epp-rtk/c/sample/epp0705 In directory sc8-pr-cvs1:/tmp/cvs-serv716/epp0705 Log Message: Directory /cvsroot/epp-rtk/epp-rtk/c/sample/epp0705 added to the repository |
|
From: Daniel M. <tub...@us...> - 2003-04-21 22:37:20
|
Update of /cvsroot/epp-rtk/epp-rtk/c/sample In directory sc8-pr-cvs1:/tmp/cvs-serv494/sample Log Message: Directory /cvsroot/epp-rtk/epp-rtk/c/sample added to the repository |
|
From: Daniel M. <tub...@us...> - 2003-04-21 22:36:33
|
Update of /cvsroot/epp-rtk/epp-rtk/c/epp-sample In directory sc8-pr-cvs1:/tmp/cvs-serv32158 Modified Files: Makefile Log Message: fix for location of libxml (on my RedHat 8 machine) Index: Makefile =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c/epp-sample/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 14 Jun 2001 19:01:04 -0000 1.1 --- Makefile 21 Apr 2003 22:36:28 -0000 1.2 *************** *** 1,5 **** OPENSSLDIR=/usr/local/ssl CC=gcc ! CFLAGS=-Wall -g -I$(OPENSSLDIR)/include LIBS=-L$(OPENSSLDIR)/lib -lxml2 -lssl -lcrypto -ldl --- 1,7 ---- OPENSSLDIR=/usr/local/ssl CC=gcc ! # the libxml includes are found in libxml2 on ! # modern systems such as RedHat 8 ! CFLAGS=-Wall -g -I$(OPENSSLDIR)/include -I/usr/include/libxml2 LIBS=-L$(OPENSSLDIR)/lib -lxml2 -lssl -lcrypto -ldl |
|
From: Asbjorn M. <ste...@us...> - 2003-01-23 10:42:07
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport In directory sc8-pr-cvs1:/tmp/cvs-serv20030 Modified Files: epp_TransportSSL.cc Log Message: Added "2003" to copyright notice... Index: epp_TransportSSL.cc =================================================================== RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** epp_TransportSSL.cc 23 Jan 2003 10:39:34 -0000 1.17 --- epp_TransportSSL.cc 23 Jan 2003 10:42:04 -0000 1.18 *************** *** 1,5 **** /************************************************************************ * EPP RTK C++ ! * Copyright (C) 2001, 2002 The Global Name Registry, Limited * * This library is free software; you can redistribute it and/or modify it --- 1,5 ---- /************************************************************************ * EPP RTK C++ ! * Copyright (C) 2001, 2002, 2003 The Global Name Registry, Limited * * This library is free software; you can redistribute it and/or modify it |
|
From: Asbjorn M. <ste...@us...> - 2003-01-23 10:39:38
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv18479
Modified Files:
epp_TransportSSL.cc
Log Message:
readFromServer now throws exception if getch() returns EOF
Index: epp_TransportSSL.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** epp_TransportSSL.cc 16 Jan 2003 15:10:07 -0000 1.16
--- epp_TransportSSL.cc 23 Jan 2003 10:39:34 -0000 1.17
***************
*** 101,105 ****
char c;
while(connected()) {
! if ((c = sslserver->getch()) == EOF) break;
s += c;
if(c == '<') { // if "<"
--- 101,107 ----
char c;
while(connected()) {
! if ((c = sslserver->getch()) == EOF) {
! throw epp_TrException(__FILE__, __LINE__, "Unable to read from server (getch)");
! }
s += c;
if(c == '<') { // if "<"
***************
*** 129,132 ****
--- 131,137 ----
} // while
+ }
+ catch(epp_TrException & e) {
+ throw e;
}
catch(...) {
|
|
From: Asbjorn M. <ste...@us...> - 2003-01-16 15:10:10
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv22893
Modified Files:
epp_TransportSSL.cc
Log Message:
Loop in readFromServer now terminates if getch() returns EOF...
Index: epp_TransportSSL.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/transport/epp_TransportSSL.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** epp_TransportSSL.cc 17 Jul 2002 11:50:17 -0000 1.15
--- epp_TransportSSL.cc 16 Jan 2003 15:10:07 -0000 1.16
***************
*** 101,105 ****
char c;
while(connected()) {
! c = sslserver->getch();
s += c;
if(c == '<') { // if "<"
--- 101,105 ----
char c;
while(connected()) {
! if ((c = sslserver->getch()) == EOF) break;
s += c;
if(c == '<') { // if "<"
|
Update of /cvsroot/epp-rtk/epp-rtk/c++/src
In directory usw-pr-cvs1:/tmp/cvs-serv30648
Modified Files:
main_contactcheck.cc main_contactcreate.cc
main_contactdelete.cc main_contactinfo.cc
main_contacttransfer.cc main_contactupdate.cc
main_domaincheck.cc main_domaincreate.cc main_domaindelete.cc
main_domaininfo.cc main_domainrenew.cc main_domaintransfer.cc
main_domainupdate.cc main_hostcheck.cc main_hostcreate.cc
main_hostdelete.cc main_hostinfo.cc main_hostupdate.cc
main_login.cc main_logout.cc main_poll.cc
Log Message:
As the functon getTestDataMap(...) now returns an "unsigned int,string" map,
the test programs have been changed similarly.
Index: main_contactcheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcheck.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_contactcheck.cc 18 Jul 2002 10:07:59 -0000 1.11
--- main_contactcheck.cc 22 Jul 2002 13:15:26 -0000 1.12
***************
*** 95,99 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 95,99 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_contactcreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactcreate.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_contactcreate.cc 18 Jul 2002 10:08:00 -0000 1.12
--- main_contactcreate.cc 22 Jul 2002 13:15:26 -0000 1.13
***************
*** 75,79 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 75,79 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_contactdelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactdelete.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_contactdelete.cc 18 Jul 2002 10:08:00 -0000 1.11
--- main_contactdelete.cc 22 Jul 2002 13:15:26 -0000 1.12
***************
*** 61,65 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 61,65 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_contactinfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactinfo.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** main_contactinfo.cc 18 Jul 2002 10:08:00 -0000 1.13
--- main_contactinfo.cc 22 Jul 2002 13:15:26 -0000 1.14
***************
*** 225,229 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 225,229 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_contacttransfer.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contacttransfer.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_contacttransfer.cc 18 Jul 2002 10:08:00 -0000 1.11
--- main_contacttransfer.cc 22 Jul 2002 13:15:26 -0000 1.12
***************
*** 91,95 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 91,95 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_contactupdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_contactupdate.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_contactupdate.cc 18 Jul 2002 10:08:00 -0000 1.12
--- main_contactupdate.cc 22 Jul 2002 13:15:26 -0000 1.13
***************
*** 63,67 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 63,67 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_domaincheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaincheck.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main_domaincheck.cc 18 Jul 2002 10:10:39 -0000 1.10
--- main_domaincheck.cc 22 Jul 2002 13:15:26 -0000 1.11
***************
*** 92,96 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 92,96 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_domaincreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaincreate.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_domaincreate.cc 18 Jul 2002 10:10:39 -0000 1.11
--- main_domaincreate.cc 22 Jul 2002 13:15:26 -0000 1.12
***************
*** 77,81 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 77,81 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_domaindelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaindelete.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main_domaindelete.cc 18 Jul 2002 10:10:39 -0000 1.10
--- main_domaindelete.cc 22 Jul 2002 13:15:26 -0000 1.11
***************
*** 61,65 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 61,65 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_domaininfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaininfo.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_domaininfo.cc 18 Jul 2002 10:10:39 -0000 1.12
--- main_domaininfo.cc 22 Jul 2002 13:15:26 -0000 1.13
***************
*** 184,188 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 184,188 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_domainrenew.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domainrenew.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_domainrenew.cc 18 Jul 2002 10:10:39 -0000 1.11
--- main_domainrenew.cc 22 Jul 2002 13:15:26 -0000 1.12
***************
*** 73,77 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 73,77 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_domaintransfer.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domaintransfer.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_domaintransfer.cc 18 Jul 2002 10:10:39 -0000 1.11
--- main_domaintransfer.cc 22 Jul 2002 13:15:27 -0000 1.12
***************
*** 94,98 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 94,98 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_domainupdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_domainupdate.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_domainupdate.cc 18 Jul 2002 10:10:39 -0000 1.12
--- main_domainupdate.cc 22 Jul 2002 13:15:27 -0000 1.13
***************
*** 65,69 ****
testLogIn(test, username, password);
! map<int,string> testDataMap;
if(argc > 1) {
--- 65,69 ----
testLogIn(test, username, password);
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_hostcheck.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostcheck.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main_hostcheck.cc 18 Jul 2002 10:10:39 -0000 1.10
--- main_hostcheck.cc 22 Jul 2002 13:15:27 -0000 1.11
***************
*** 92,96 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 92,96 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_hostcreate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostcreate.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_hostcreate.cc 18 Jul 2002 10:10:39 -0000 1.12
--- main_hostcreate.cc 22 Jul 2002 13:15:27 -0000 1.13
***************
*** 78,82 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 78,82 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_hostdelete.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostdelete.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main_hostdelete.cc 18 Jul 2002 10:10:39 -0000 1.10
--- main_hostdelete.cc 22 Jul 2002 13:15:27 -0000 1.11
***************
*** 62,66 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 62,66 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_hostinfo.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostinfo.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_hostinfo.cc 18 Jul 2002 10:10:39 -0000 1.11
--- main_hostinfo.cc 22 Jul 2002 13:15:27 -0000 1.12
***************
*** 133,137 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 133,137 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_hostupdate.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_hostupdate.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** main_hostupdate.cc 18 Jul 2002 10:10:39 -0000 1.12
--- main_hostupdate.cc 22 Jul 2002 13:15:27 -0000 1.13
***************
*** 63,67 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 63,67 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_login.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_login.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_login.cc 18 Jul 2002 10:12:58 -0000 1.11
--- main_login.cc 22 Jul 2002 13:15:27 -0000 1.12
***************
*** 74,78 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 74,78 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_logout.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_logout.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** main_logout.cc 18 Jul 2002 10:12:58 -0000 1.8
--- main_logout.cc 22 Jul 2002 13:15:27 -0000 1.9
***************
*** 60,64 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 60,64 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
Index: main_poll.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/main_poll.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main_poll.cc 18 Jul 2002 10:12:58 -0000 1.11
--- main_poll.cc 22 Jul 2002 13:15:27 -0000 1.12
***************
*** 137,141 ****
return 1;
! map<int,string> testDataMap;
if(argc > 1) {
--- 137,141 ----
return 1;
! map<unsigned int,string> testDataMap;
if(argc > 1) {
|
