X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fcommand_client.hxx;h=59d4755a3b00086d592c931be3e0ec99216e4017;hp=8c6b2bfad837fed3b6623d3e9aa3d50a9d1371a2;hb=4b995a82e29808cf8125889f83ec70fc7b5c77af;hpb=45a2ebc9695c4d7be6548b7e0f800d117ae56a0b

diff --git a/src/command_client.hxx b/src/command_client.hxx
index 8c6b2bf..59d4755 100644
--- a/src/command_client.hxx
+++ b/src/command_client.hxx
@@ -19,6 +19,9 @@
 #ifndef __LIBT2N_COMMAND_CLIENT
 #define __LIBT2N_COMMAND_CLIENT
 
+#include <functional>
+#include <string>
+
 #include "client.hxx"
 #include "container.hxx"
 
@@ -28,19 +31,44 @@ namespace libt2n
 /// a client sending out commands to a server
 class command_client
 {
+    public:
+        static const long long command_timeout_usec_default=90000000;
+        static const long long hello_timeout_usec_default=30000000;
+
     private:
-        client_connection &c;
+        client_connection *c;
 
         long long hello_timeout_usec;
         long long command_timeout_usec;
 
         void read_hello();
         std::string read_packet(const long long &usec_timeout);
+        bool check_hello(const std::string& hellostr);
+
+        std::auto_ptr<t2n_exception> constructorException;
 
     public:
-        command_client(client_connection& _c, long long _command_timeout_usec=90000000, long long _hello_timeout_usec=30000000);
+        command_client(client_connection* _c,
+            long long _command_timeout_usec=command_timeout_usec_default,
+            long long _hello_timeout_usec=hello_timeout_usec_default);
+        virtual ~command_client() {}
+
+        void replace_connection(client_connection* _c);
 
         void send_command(command* cmd, result_container &res);
+
+        void set_command_timeout_usec(long long _command_timeout_usec=command_timeout_usec_default)
+            { command_timeout_usec=_command_timeout_usec; }
+        void set_hello_timeout_usec(long long _hello_timeout_usec=hello_timeout_usec_default)
+            { hello_timeout_usec=_hello_timeout_usec; }
+        long long get_command_timeout_usec(void)
+            { return command_timeout_usec; }
+        long long get_hello_timeout_usec(void)
+            { return hello_timeout_usec; }
+        bool is_connection_closed(void)
+            { return c->is_closed(); }
+        t2n_exception* get_constuctor_exception(void)
+            { return constructorException.get(); }
 };
 
 }