libt2n: (gerd) fixes & testcase

[libt2n] / src / socket_client.hxx

diff --git a/src/socket_client.hxx b/src/socket_client.hxx
index 117aa6d..198e1a7 100644 (file)
--- a/src/socket_client.hxx
+++ b/src/socket_client.hxx
@@ -25,15 +25,25 @@
 namespace libt2n
 {
 
-class socket_client_connection : public client_connection, socket_handler
+class socket_client_connection : public client_connection, public socket_handler
 {
+    static const int max_retries_default=3;
+
     private:
         void real_write(const std::string& data)
-            { socket_handler::write(data); }
+            { socket_write(data); }
+
+        void connect();
+
+        int max_retries;
+
+        std::string path;
+        std::string server;
+        int port;
 
     public:
-        socket_client_connection(int port, const char* ip="0.0.0.0");
-        socket_client_connection(const char* path, mode_t filemode, const char* user="", const char* group="");
+        socket_client_connection(const std::string& _server, int _port, int _max_retries=max_retries_default);
+        socket_client_connection(const std::string& _path, int _max_retries=max_retries_default);
 
         void fill_buffer(long long usec_timeout=-1)
             { socket_handler::fill_buffer(buffer,usec_timeout); }