X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fcommand_server.cpp;h=2aa4fc0483c1c3aae3f21156edb84505e596ef85;hp=15a19a75552b449a01785bb9ac3a2732777c56c3;hb=8104c8f70605ee24230e5988d7bf68e3fce7465a;hpb=7087e18783f91d2b889e880462d1d1da24831c28

diff --git a/src/command_server.cpp b/src/command_server.cpp
index 15a19a7..2aa4fc0 100644
--- a/src/command_server.cpp
+++ b/src/command_server.cpp
@@ -20,25 +20,57 @@
 #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);
@@ -47,6 +79,14 @@ void command_server::handle_packet(const std::string& packet, server_connection*
     // 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();
 
@@ -72,6 +112,13 @@ void command_server::handle_packet(const std::string& packet, server_connection*
     // 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());
 }