namespace libt2n
{
-command_client::command_client(client_connection& _c)
+command_client::command_client(client_connection& _c, long long _command_timeout_usec, long long _hello_timeout_usec)
: c(_c)
{
+ 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)));
read_hello();
}
-void command_client::read_hello()
+std::string command_client::read_packet(const long long &usec_timeout)
{
- // TODO: fix timeout
string resultpacket;
- while(!c.get_packet(resultpacket) && !c.is_closed())
- c.fill_buffer();
+ 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);
- istringstream hello(resultpacket);
+ if (!got_packet)
+ throw t2n_transfer_error("timeout exceeded");
+
+ return resultpacket;
+}
+
+void command_client::read_hello()
+{
+ istringstream hello(read_packet(hello_timeout_usec));
char chk[5];
hello.read(chk,4);
command_container cc(cmd);
boost::archive::binary_oarchive oa(ofs);
- // TODO: exceptions
- oa << cc;
+ try
+ {
+ oa << cc;
+ }
+ catch(boost::archive::archive_exception &e)
+ {
+ ostringstream msg;
+ msg << "archive_exception while serializing on client-side, code " << e.code << " (" << e.what() << ")";
+ throw t2n_serialization_error(msg.str());
+ }
+ catch(...)
+ { throw; }
std::ostream* ostr;
if ((ostr=c.get_logstream(fulldebug))!=NULL)
c.write(ofs.str());
- // TODO: fix timeout
- string resultpacket;
- while(!c.get_packet(resultpacket))
- c.fill_buffer();
-
- istringstream ifs(resultpacket);
+ istringstream ifs(read_packet(command_timeout_usec));
boost::archive::binary_iarchive ia(ifs);
- // TODO: exceptions
- ia >> res;
+ try
+ {
+ ia >> res;
+ }
+ catch(boost::archive::archive_exception &e)
+ {
+ ostringstream msg;
+ msg << "archive_exception while deserializing on client-side, code " << e.code << " (" << e.what() << ")";
+ throw t2n_serialization_error(msg.str());
+ }
+ catch(...)
+ { throw; }
if ((ostr=c.get_logstream(fulldebug))!=NULL)
{