libt2n: (gerd) add client timeouts & tests, hello peek missing

[libt2n] / src / command_server.cpp

diff --git a/src/command_server.cpp b/src/command_server.cpp
index 2a4a7b4..4f386ec 100644 (file)
--- a/src/command_server.cpp
+++ b/src/command_server.cpp
@@ -34,6 +34,10 @@
 #include "container.hxx"
 #include "log.hxx"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 using namespace std;
 
 namespace libt2n
@@ -43,12 +47,23 @@ command_server::command_server(server& _s)
     : s(_s)
 {
     // register callback
-    s.add_callback(new_connection,bind(&command_server::new_connection_callback, boost::ref(*this), _1));
+    s.add_callback(new_connection,bind(&command_server::send_hello, boost::ref(*this), _1));
 }
 
-void command_server::new_connection_callback(unsigned int conn_id)
+void command_server::send_hello(unsigned int conn_id)
 {
-    cerr << "new connection callback: " << conn_id << endl;
+    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
@@ -108,12 +123,12 @@ void command_server::handle_packet(const std::string& packet, server_connection*
 }
 
 /** @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;