X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fcommand_client.cpp;h=5d7169232acb3e07775a46d684e3466ee276b439;hp=0f44203cc734ef6b125e66282898e0768d4b6ef9;hb=696c95c2808d6f88df2b348f9e77fc66c9068976;hpb=af84dfb53a739a0c8c343d9172f1847fa908906d diff --git a/src/command_client.cpp b/src/command_client.cpp index 0f44203..5d71692 100644 --- a/src/command_client.cpp +++ b/src/command_client.cpp @@ -39,21 +39,57 @@ using namespace std; namespace libt2n { -command_client::command_client(client_connection& _c, long long _command_timeout_usec, long long _hello_timeout_usec) +/** + * Constructor + * @param _c connection for this command. Ownership of the pointer is outside. + * @param _command_timeout_usec timeout until the command has to be completed + * @param _hello_timeout_usec timeout until hello has to be received + */ +command_client::command_client(client_connection* _c, long long _command_timeout_usec, long long _hello_timeout_usec) : c(_c) + , constructorException(NULL) { command_timeout_usec=_command_timeout_usec; hello_timeout_usec=_hello_timeout_usec; // for reconnects - c.add_callback(new_connection,bind(&command_client::read_hello, boost::ref(*this))); + c->add_callback(new_connection,bind(&command_client::read_hello, boost::ref(*this))); - read_hello(); + // don't expect hello from an always closed connection (like dummy_client_connection) + if (!is_connection_closed()) + { + try + { + read_hello(); + } + catch (t2n_communication_error &e) + { + c->close(); + + // store a copy of the exception that you can find out details about the error later + constructorException = e.clone(); + } + catch (...) + { + throw; + } + } } -/** @brief replace the connection currently in use with a new one +/** + * Destructor + */ +command_client::~command_client() +{ + if (constructorException) + { + delete constructorException; + constructorException = NULL; + } +} - @param _c reference of the new connection +/** @brief replace the connection currently in use with a new one + @param _c pointer to the new connection @note the old connection must still be valid when this method is called, it can safely be deleted after this method returned @@ -61,17 +97,17 @@ command_client::command_client(client_connection& _c, long long _command_timeout @note all callbacks registered on the old connection will be copied over to the new one */ -void command_client::replace_connection(client_connection& _c) +void command_client::replace_connection(client_connection* _c) { // copy all callbacks registered on the old connection for(callback_event_type e=static_cast(0); e < __events_end; e=static_cast(static_cast(e)+1)) { - list > evcb=c.get_callback_list(e); + list > evcb=c->get_callback_list(e); for (list >::iterator i=evcb.begin(); i != evcb.end(); i++) - _c.add_callback(e,*i); + _c->add_callback(e,*i); } // replace the connection @@ -80,13 +116,19 @@ void command_client::replace_connection(client_connection& _c) read_hello(); } +/** @brief return a complete packet + @param usec_timeout maximum microseconds to wait until the packet is complete + @retval packet data as std::string + + @note throws a t2n_transfer_error if the timeout is exceeded +*/ std::string command_client::read_packet(const long long &usec_timeout) { string resultpacket; bool got_packet=false; long long my_timeout=usec_timeout; - while(!(got_packet=c.get_packet(resultpacket)) && my_timeout > 0 && !c.is_closed()) - c.fill_buffer(my_timeout,&my_timeout); + while(!(got_packet=c->get_packet(resultpacket)) && my_timeout > 0 && !c->is_closed()) + c->fill_buffer(my_timeout,&my_timeout); if (!got_packet) throw t2n_transfer_error("timeout exceeded"); @@ -94,16 +136,20 @@ std::string command_client::read_packet(const long long &usec_timeout) return resultpacket; } +/** @brief read and check the hello message at the beginning of a connection + + @note throws exceptions if something went wrong +*/ void command_client::read_hello() { string resultpacket; bool got_packet=false; long long my_timeout=hello_timeout_usec; - while(!(got_packet=c.get_packet(resultpacket)) && my_timeout > 0 && !c.is_closed()) + while(!(got_packet=c->get_packet(resultpacket)) && my_timeout > 0 && !c->is_closed()) { - c.fill_buffer(my_timeout,&my_timeout); + c->fill_buffer(my_timeout,&my_timeout); - c.peek_packet(resultpacket); + c->peek_packet(resultpacket); check_hello(resultpacket); // will throw before timeout if wrong data received } @@ -114,7 +160,14 @@ void command_client::read_hello() throw t2n_version_mismatch("illegal hello received (incomplete): "+resultpacket); } -bool command_client::check_hello(const string& hellostr) +/** @brief check if a hello message is valid + @param hellostr std::string with the message to check + @retval true if the hello is good and complete + + @note you can check incomplete hellos. you will get a false return value + but no exception. throws exceptions as soon as something is wrong. +*/ +bool command_client::check_hello(const std::string& hellostr) { istringstream hello(hellostr); @@ -189,12 +242,22 @@ bool command_client::check_hello(const string& hellostr) return true; } +/** @brief send a command to the server and store the result + @param cmd pointer to a command-object + @param[out] res result container to store the result in + + @note you can check incomplete hellos. you will get a false return value + but no exception. throws exceptions as soon as something is wrong. +*/ void command_client::send_command(command* cmd, result_container &res) { ostringstream ofs; command_container cc(cmd); boost::archive::binary_oarchive oa(ofs); + if (is_connection_closed()) + throw t2n_transfer_error("connection to server is closed"); + try { oa << cc; @@ -209,14 +272,14 @@ void command_client::send_command(command* cmd, result_container &res) { throw; } std::ostream* ostr; - if ((ostr=c.get_logstream(fulldebug))!=NULL) + if ((ostr=c->get_logstream(fulldebug))!=NULL) { (*ostr) << "sending command, decoded data: " << std::endl; boost::archive::xml_oarchive xo(*ostr); xo << BOOST_SERIALIZATION_NVP(cc); - } + } - c.write(ofs.str()); + c->write(ofs.str()); istringstream ifs(read_packet(command_timeout_usec)); boost::archive::binary_iarchive ia(ifs); @@ -234,7 +297,7 @@ void command_client::send_command(command* cmd, result_container &res) catch(...) { throw; } - if ((ostr=c.get_logstream(fulldebug))!=NULL) + if ((ostr=c->get_logstream(fulldebug))!=NULL) { (*ostr) << "received result, decoded data: " << std::endl; boost::archive::xml_oarchive xo(*ostr);