Diff: UDPSocket.cpp

Revision:

10:d24738f4ef99

Parent:

6:cd2e5559786d

Child:

11:3d83c348fb8b

--- a/UDPSocket.cpp	Fri Jul 27 15:56:20 2012 +0000
+++ b/UDPSocket.cpp	Tue Jul 31 11:50:55 2012 +0000
@@ -50,12 +50,12 @@
 }
 
 // -1 if unsuccessful, else number of bytes written
-int UDPSocket::sendTo(UDPPacket& packet, int timeout_ms) {
+int UDPSocket::sendTo(UDPPacket& packet) {
     if (_sock_fd < 0)
         return -1;
     
-    if (timeout_ms != 0) {
-        TimeInterval timeout(timeout_ms);
+    if (!_blocking) {
+        TimeInterval timeout(_timeout);
         if (wait_writable(timeout) != 0)
             return -1;
     }
@@ -64,12 +64,12 @@
 }
 
 // -1 if unsuccessful, else number of bytes received
-int UDPSocket::receiveFrom(UDPPacket& packet, int timeout_ms) {
+int UDPSocket::receiveFrom(UDPPacket& packet) {
     if (_sock_fd < 0)
         return -1;
     
-    if (timeout_ms != 0) {
-        TimeInterval timeout(timeout_ms);
+    if (!_blocking) {
+        TimeInterval timeout(_timeout);
         if (wait_readable(timeout) != 0)
             return -1;
     }