X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_client.hxx;h=7160e0dd1b180295e56dde8f1b46777d5313af9f;hp=8a379f8b2cbdf09ba398b89f15744165066559df;hb=refs%2Ftags%2Fv0.2;hpb=9424729586fdb0aabb671d2f1266bdb07e0bed38

diff --git a/src/socket_client.hxx b/src/socket_client.hxx
index 8a379f8..7160e0d 100644
--- a/src/socket_client.hxx
+++ b/src/socket_client.hxx
@@ -22,6 +22,8 @@
 #include "client.hxx"
 #include "socket_handler.hxx"
 
+struct sockaddr;
+
 namespace libt2n
 {
 /** @brief a connection from client to server using sockets.
@@ -30,33 +32,47 @@ namespace libt2n
  */
 class socket_client_connection : public client_connection, public socket_handler
 {
-    static const int max_retries_default=3;
+    public:
+        static const int max_retries_default=3;
+        static const long long connect_timeout_usec_default=30000000;
 
     private:
         void real_write(const std::string& data)
             { socket_write(data); }
 
-        void connect();
+        void tcp_connect(int max_retries);
+        void unix_connect(int max_retries);
+        void connect_with_timeout(struct sockaddr *sock_addr,unsigned int sockaddr_size);
 
         int max_retries;
+        long long connect_timeout_usec;
 
         std::string path;
         std::string server;
         int port;
 
+        std::ostream* get_logstream(log_level_values level)
+            { return client_connection::get_logstream(level); }
+
     public:
-        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);
+        socket_client_connection(int _port, const std::string& _server="127.0.0.1", 
+            long long _connect_timeout_usec=connect_timeout_usec_default, 
+            int _max_retries=max_retries_default);
+        socket_client_connection(const std::string& _path,
+            long long _connect_timeout_usec=connect_timeout_usec_default, 
+            int _max_retries=max_retries_default);
 
         /** @brief read data from the socket and copy it into buffer
             @param usec_timeout wait until new data is found, max timeout usecs.
-                    -1: wait endless
-                    NULL: no timeout
+                  -1: wait endless
+                   0: return instantly
+            @param usec_timeout_remaining if non-NULL the function will write the
+                  not used time to the given target
             @retval true if new data was found (does not mean that the received data 
                     is a complete packet though)
         */
-        bool fill_buffer(long long usec_timeout=-1)
-            { return socket_handler::fill_buffer(buffer,usec_timeout); }
+        bool fill_buffer(long long usec_timeout=-1, long long *usec_timeout_remaining=NULL)
+            { return socket_handler::fill_buffer(buffer,usec_timeout,usec_timeout_remaining); }
 
         void close();
 };