Diff: Socket/Socket.h

Revision:

67:ff9472d344d4

Parent:

66:69072b3c5bca

--- a/Socket/Socket.h	Tue May 13 15:56:28 2014 +0000
+++ b/Socket/Socket.h	Tue May 13 16:03:40 2014 +0000
@@ -9,14 +9,14 @@
 public:
     Socket() {
         _socket  = -1;
-        _timeout = MDMParser::TIMEOUT_BLOCKING;
+        _timeout_ms = MDMParser::TIMEOUT_BLOCKING;
         _mdm     = NULL;
     }
     
-    void set_blocking(bool blocking, unsigned int timeout=1) {
-        _timeout = blocking ? MDMParser::TIMEOUT_BLOCKING : timeout;
+    void set_blocking(bool blocking, unsigned int timeout = 1500) {
+        _timeout_ms = blocking ? MDMParser::TIMEOUT_BLOCKING : (int)timeout;
         if (_socket >= 0) {
-            _mdm->socketSetBlocking(_socket, _timeout); 
+            _mdm->socketSetBlocking(_socket, _timeout_ms); 
         }
     }
     
@@ -27,7 +27,7 @@
             ret = _mdm->socketClose(_socket);
             _mdm->socketFree(_socket);
             _socket = -1;
-            _timeout = MDMParser::TIMEOUT_BLOCKING;
+            _timeout_ms = MDMParser::TIMEOUT_BLOCKING;
         }
         return ret ? 0 : -1;
     }
@@ -36,7 +36,7 @@
     
 protected:
     int _socket;
-    unsigned int _timeout;
+    int _timeout_ms;
     MDMParser* _mdm;
 };