Changeset 14:3caa1d3122db in xplcommon for src/xplcommon/posix/ServerSocket.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/ServerSocket.cc (modified) (3 diffs)

src/xplcommon/posix/ServerSocket.cc

@@ -34 +34 @@
 #include "Socket.h"
 
-#include <cstdio>
-
 #include <unistd.h>
 #include <sys/socket.h>
@@ -49 +47 @@
     Waitable(waiter, Socket::socket(domain, type, protocol))
 {
+    if (fd<0) setErrorCodeFromErrno();
 }
 
@@ -55 +54 @@
 ServerSocket::~ServerSocket()
 {
-    ::close(fd);
+    if (fd>=0) ::close(fd);
 }
 
 //------------------------------------------------------------------------------
 
-int ServerSocket::bind(const struct sockaddr* addr, size_t addrlen,
-                       bool reuseaddr)
+bool ServerSocket::bind(const struct sockaddr* addr, size_t addrlen,
+                        bool reuseaddr)
 {
     if (reuseaddr) {
         int reuse = 1;
         if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse))<0) {
-            perror("xplcommon::posix::Socket::bind: setsockopt");
-            return -1;
+            setErrorCodeFromErrno();
+            return false;
         }
     }
 
-    return ::bind(fd, addr, addrlen);
+    if (::bind(fd, addr, addrlen)<0) {
+        setErrorCodeFromErrno();
+        return false;
+    }
+
+    return true;
 }
 
 //------------------------------------------------------------------------------
 
-int ServerSocket::listen(int backlog)
+bool ServerSocket::listen(int backlog)
 {
-    return ::listen(fd, backlog);
+    if (::listen(fd, backlog)<0) {
+        setErrorCodeFromErrno();
+        return false;
+    } else {
+        return true;
+    }
+}
+
+//------------------------------------------------------------------------------
+
+int ServerSocket::accept(struct sockaddr* addr, size_t* addrlen)
+{
+    socklen_t alen = (addrlen==0) ? 0 : *addrlen;
+    int result = ::accept(fd, addr, (addrlen==0) ? 0 : &alen);
+    if (result<0 && errno!=EAGAIN && errno!=EWOULDBLOCK) {
+        setErrorCodeFromErrno();
+    } else {
+        if (addrlen!=0) *addrlen = alen;
+    }
+    return result;
 }