Changeset 14:3caa1d3122db in xplcommon for src/xplcommon/posix/Connector.cc

Timestamp:

12/29/12 10:03:12 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Moved the storage of the error code to where it belongs

File:

• src/xplcommon/posix/Connector.cc (modified) (3 diffs)

src/xplcommon/posix/Connector.cc

@@ -34 +34 @@
 #include "ClientSocket.h"
 
-#include <cerrno>
-
 #include <poll.h>
 #include <sys/socket.h>
@@ -53 +51 @@
     const struct sockaddr* addr = getAddress(addrlen);
 
-    int result = ::connect(socket.fd, addr, addrlen);
-    if (result<0) {
-        if (errno==EINPROGRESS) {
-            connecting = true;
-            socket.events |= POLLOUT;
-        } else {
-            setErrorCode(errno);
-        }
+    if (socket.connect(addr, addrlen)) {
+        connected = true;
+        return true;
+    } else if (socket.failed()) {
+        return false;
     } else {
-        connected = true;
+        connecting = true;
+        socket.events |= POLLOUT;
+        return false;
     }
-
-    return result==0;
 }
 
@@ -80 +75 @@
     socklen_t len = sizeof(error);
     if (getsockopt(socket.fd, SOL_SOCKET, SO_ERROR, &error, &len)<0) {
-        setErrorCode(errno);
+        socket.setErrorCodeFromErrno();
     } else {
         if (error==0) {
             connected = true;
         } else {
-            setErrorCode(error);
+            socket.setErrorCode(error);
         }
     }