Changeset 7 in libcf++ for trunk/src/network.cpp

Timestamp:

03/29/15 16:30:07 (9 years ago)

Author:

cheese

Message:

#1 fix and add interfaces

File:

• trunk/src/network.cpp (modified) (6 diffs)

trunk/src/network.cpp

@@ -39 +39 @@
 #endif
 
-#define UNUSED_SOCKET   -1
-
 /*--------------------------------------------------------------*/
 /**
@@ -62 +60 @@
 }
 
-static cf::void_t setNonBlocking(const cf::socket_t sock,
-                                 const cf::bool_t flag)
-{
-#ifdef _ON_WINDOWS
-    cf::ulong_t mode = flag ? 1 : 0;
-    ioctlsocket(sock, FIONBIO, &mode);
-#else
-    cf::int32_t mode = fcntl(sock, F_GETFL, 0);
-
-    if (flag)   mode |=  O_NONBLOCK;
-    else        mode &= ~O_NONBLOCK;
-
-    fcntl(sock, F_SETFL, mode);
-#endif
-}
-
 static cf::void_t waitForTimeout(const cf::socket_t sock,
                                  const cf::int32_t timeout,
@@ -206 +188 @@
 {
     close();
+}
+
+cf::socket_t cf::network::tcp::descriptor() const
+{
+    return mSocket;
 }
 
@@ -348 +335 @@
         THROW_EXCEPTION("has invalid socket");
 
-    close();
-
     mSocket = sock;
 }
@@ -477 +462 @@
 }
 
+cf::void_t cf::network::tcp::setNonBlocking(const cf::bool_t flag)
+{
+#ifdef _ON_WINDOWS
+    cf::ulong_t mode = flag ? 1 : 0;
+    ioctlsocket(mSocket, FIONBIO, &mode);
+#else
+    cf::int32_t mode = fcntl(mSocket, F_GETFL, 0);
+
+    if (flag)   mode |=  O_NONBLOCK;
+    else        mode &= ~O_NONBLOCK;
+
+    fcntl(mSocket, F_SETFL, mode);
+#endif
+}
+
 cf::void_t cf::network::tcp::setTimeout(const cf::int32_t seconds)
 {
-    setNonBlocking(mSocket, seconds > 0 /*? true : false*/);
+    setNonBlocking(seconds > 0 /*? true : false*/);
     mTimeout = seconds;
 }
@@ -535 +535 @@
     return std::string(asciiz);
 }
+
+
+cf::uint32_t cf::network::byteOrder::htonl(cf::uint32_t in)
+{
+    return htonl(in);
+}
+
+cf::uint16_t cf::network::byteOrder::htons(cf::uint16_t in)
+{
+    return htons(in);
+}
+
+cf::uint32_t cf::network::byteOrder::ntohl(cf::uint32_t in)
+{
+    return ntohl(in);
+}
+
+cf::uint16_t cf::network::byteOrder::ntohs(cf::uint16_t in)
+{
+    return ntohs(in);
+}