Changeset 7 in libcf++ for trunk/src

Timestamp:

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

Author:

cheese

Message:

#1 fix and add interfaces

Location:

trunk/src

Files:

• bin.cpp (modified) (3 diffs)
• codec.cpp (modified) (1 diff)
• logger.cpp (modified) (1 diff)
• network.cpp (modified) (6 diffs)

trunk/src/bin.cpp

@@ -10 +10 @@
 
 cf::bin::bin(const cf::uint8_t * in,
-             const cf::size_t size)
+             const cf::size_t length)
 {
-    set(in, size);
+    set(in, length);
 }
 
@@ -55 +55 @@
 
 cf::void_t cf::bin::set(const cf::uint8_t * in,
-                        const cf::size_t size)
+                        const cf::size_t length)
 {
     if (!in)
         return;
 
-    resize(size);
-    memcpy(buffer(), in, size);
+    resize(length);
+    memcpy(buffer(), in, length);
 }
 
@@ -123 +123 @@
 
 cf::size_t cf::bin::find(const cf::uint8_t * in,
-                         const cf::size_t size) const
+                         const cf::size_t length) const
 {
-    cf::size_t limit = this->size() - size;
+    cf::size_t limit = size() - length;
 
     if (limit < 0 || !in)
         return -1;
 
-    for (cf::size_t iter = 0, iterIn = 0 ; iter <= limit ; iter++)
+    for (cf::size_t iter = 0 ; iter <= limit ; iter++)
     {
-        for (iterIn = 0 ; iterIn < size ; iterIn++)
-        {
-            if (*((buffer() + iter) + iterIn) != *(in + iterIn))
-                break;
-        }
-
-        if (iterIn == size)
+        if (!memcmp(buffer() + iter, in, length))
             return iter;
     }

trunk/src/codec.cpp

@@ -21 +21 @@
     if (in.empty())
         THROW_EXCEPTION("input is empty");
+
     try
     {

trunk/src/logger.cpp

@@ -49 +49 @@
         }
 
-        filepath += STR("." << cf::task::process::id());
+        if (option & cf::logger::PID)
+            filepath += STR("." << cf::task::process::id());
 
         /* FORCED : append file-extension */

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);
+}