#include <string>
#include <sstream>
#include <stdexcept>
+#include <iostream>
#include <boost/archive/binary_oarchive.hpp>
#include <boost/archive/binary_iarchive.hpp>
#include <boost/archive/xml_oarchive.hpp>
#include <boost/archive/xml_iarchive.hpp>
#include <boost/serialization/serialization.hpp>
-#include <boost/serialization/export.hpp>
+
+#include <boost/bind.hpp>
#include "command_server.hxx"
#include "container.hxx"
+#include "log.hxx"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
using namespace std;
namespace libt2n
{
+command_server::command_server(server& _s)
+ : s(_s)
+{
+ // register callback
+ s.add_callback(new_connection,bind(&command_server::send_hello, boost::ref(*this), _1));
+}
+
+void command_server::send_hello(unsigned int conn_id)
+{
+ server_connection* sc=s.get_connection(conn_id);
+
+ ostringstream hello;
+
+ hello << "T2Nv" << PROTOCOL_VERSION << ';';
+
+ int byteordercheck=1;
+ hello.write((char*)&byteordercheck,sizeof(byteordercheck));
+
+ hello << ';';
+
+ sc->write(hello.str());
+}
+
/// handle a command including deserialization and answering
void command_server::handle_packet(const std::string& packet, server_connection* conn)
{
+ OBJLOGSTREAM(s,debug,"handling packet from connection " << conn->get_id());
+
// deserialize packet
istringstream ifs(packet);
boost::archive::binary_iarchive ia(ifs);
// TODO: catch
ia >> ccont;
+ std::ostream* ostr;
+ if ((ostr=s.get_logstream(fulldebug))!=NULL)
+ {
+ (*ostr) << "decoded packet data: " << std::endl;
+ boost::archive::xml_oarchive xo(*ostr);
+ xo << BOOST_SERIALIZATION_NVP(ccont);
+ }
+
// TODO: cast to command subclass (template)
command *cmd=ccont.get_command();
// TODO: catch
oa << res;
+ if ((ostr=s.get_logstream(fulldebug))!=NULL)
+ {
+ (*ostr) << "returning result, decoded data: " << std::endl;
+ boost::archive::xml_oarchive xo(*ostr);
+ xo << BOOST_SERIALIZATION_NVP(res);
+ }
+
conn->write(ofs.str());
}
/** @brief handle incoming commands
- @param usec_timeout wait until new data is found, max timeout usecs.
- -1: wait endless, 0: no timeout
+ @param[in,out] usec_timeout wait until new data is found, max timeout usecs.
+ -1: wait endless, 0: instant return
*/
-void command_server::handle(long long usec_timeout)
+void command_server::handle(long long usec_timeout, long long* usec_timeout_remaining)
{
- if (s.fill_buffer(usec_timeout))
+ if (s.fill_buffer(usec_timeout,usec_timeout_remaining))
{
string packet;
unsigned int conn_id;