Changeset 19 in libcf++

Timestamp:

08/14/15 01:20:34 (9 years ago)

Author:

cheese

Message:

#1 rename namespace from network to net

Location:

trunk

Files:

• include/cf/net.h (moved) (moved from trunk/include/cf/network.h ) (2 diffs)
• src/net.cpp (moved) (moved from trunk/src/network.cpp ) (25 diffs)
• test/test.cpp (modified) (5 diffs)
• windows/libcf++.sln (modified) (1 diff)

trunk/include/cf/net.h

@@ -1 +1 @@
 /**
- * @file network.h
+ * @file net.h
  * @author myusgun@gmail.com
  * @brief network
@@ -19 +19 @@
      * network
      */
-    namespace network
+    namespace net
     {
         /**

trunk/src/net.cpp

@@ -1 +1 @@
 /**
- * @file network.cpp
+ * @file net.cpp
  * @author myusgun@gmail.com
  * @brief network
  */
-#include "cf/network.h"
+#include "cf/net.h"
 
 #include <iostream>
@@ -99 +99 @@
 }
 
-static cf::void_t setReuseAddress(const cf::network::tcp & tcp)
+static cf::void_t setReuseAddress(const cf::net::tcp & tcp)
     throw (cf::exception)
 {
@@ -118 +118 @@
                                                          socklen_t *len);
 
-static cf::network::host getSocketNameFromFunction(const cf::socket_t sock,
+static cf::net::host getSocketNameFromFunction(const cf::socket_t sock,
                                                    getSocketNameAPI api)
     throw (cf::exception)
@@ -132 +132 @@
                         << ")");
 
-    return cf::network::host(convertAddressToString(addr), addr.sin_port);
+    return cf::net::host(convertAddressToString(addr), addr.sin_port);
 }
 /*--------------------------------------------------------------*/
 
-cf::network::host::host(const std::string & address,
+cf::net::host::host(const std::string & address,
                         const cf::uint16_t port)
     : mAddress(address),
@@ -143 +143 @@
 }
 
-const std::string & cf::network::host::address() const
+const std::string & cf::net::host::address() const
 {
     return mAddress;
 }
 
-cf::uint16_t cf::network::host::port() const
+cf::uint16_t cf::net::host::port() const
 {
     return mPort;
 }
 
-cf::network::tcp::tcp(const cf::socket_t attachedSocket)
+cf::net::tcp::tcp(const cf::socket_t attachedSocket)
     throw (cf::exception)
     : mSocket (attachedSocket),
@@ -180 +180 @@
 }
 
-cf::network::tcp::~tcp()
+cf::net::tcp::~tcp()
 {
     close();
 }
 
-cf::socket_t cf::network::tcp::descriptor() const
+cf::socket_t cf::net::tcp::descriptor() const
 {
     return mSocket;
 }
 
-cf::void_t cf::network::tcp::close()
+cf::void_t cf::net::tcp::close()
 {
     if (mSocket == cf::nodesc)
@@ -200 +200 @@
 }
 
-cf::void_t cf::network::tcp::connect(const cf::network::host & peer,
+cf::void_t cf::net::tcp::connect(const cf::net::host & peer,
                                      const cf::int32_t timeout)
     throw (cf::exception)
@@ -207 +207 @@
 }
 
-cf::void_t cf::network::tcp::connect(const std::string & address,
+cf::void_t cf::net::tcp::connect(const std::string & address,
                                      const cf::uint16_t port,
                                      const cf::int32_t timeout)
@@ -270 +270 @@
 }
 
-cf::void_t cf::network::tcp::bind(const cf::uint16_t port) const
+cf::void_t cf::net::tcp::bind(const cf::uint16_t port) const
     throw (cf::exception)
 {
@@ -299 +299 @@
 }
 
-cf::void_t cf::network::tcp::listen(const cf::int32_t backlog) const
+cf::void_t cf::net::tcp::listen(const cf::int32_t backlog) const
     throw (cf::exception)
 {
@@ -307 +307 @@
 }
 
-cf::network::tcp cf::network::tcp::accept() const
+cf::net::tcp cf::net::tcp::accept() const
     throw (cf::exception)
 {
@@ -318 +318 @@
         THROW_EXCEPTION("cannot accept client");
 
-    return cf::network::tcp(sock).detach();
-}
-
-cf::void_t cf::network::tcp::attach(const cf::socket_t sock)
+    return cf::net::tcp(sock).detach();
+}
+
+cf::void_t cf::net::tcp::attach(const cf::socket_t sock)
     throw (exception)
 {
@@ -330 +330 @@
 }
 
-cf::socket_t cf::network::tcp::detach()
+cf::socket_t cf::net::tcp::detach()
     throw (exception)
 {
@@ -343 +343 @@
 }
 
-cf::void_t cf::network::tcp::send(const cf::bin & in) const
+cf::void_t cf::net::tcp::send(const cf::bin & in) const
     throw (cf::exception)
 {
@@ -357 +357 @@
 }
 
-cf::void_t cf::network::tcp::receive(cf::bin & out) const
+cf::void_t cf::net::tcp::receive(cf::bin & out) const
     throw (cf::exception)
 {
@@ -384 +384 @@
 }
 
-cf::bin cf::network::tcp::receive(const cf::int32_t size) const
+cf::bin cf::net::tcp::receive(const cf::int32_t size) const
     throw (cf::exception)
 {
@@ -395 +395 @@
 }
 
-cf::bin cf::network::tcp::receive() const
+cf::bin cf::net::tcp::receive() const
     throw (cf::exception)
 {
@@ -414 +414 @@
 }
 
-cf::void_t cf::network::tcp::getOption(const cf::int32_t optname,
+cf::void_t cf::net::tcp::getOption(const cf::int32_t optname,
                                        cf::void_t * optval,
                                        cf::int32_t * optlen) const
@@ -434 +434 @@
 }
 
-cf::void_t cf::network::tcp::setOption(const cf::int32_t optname,
+cf::void_t cf::net::tcp::setOption(const cf::int32_t optname,
                                        const cf::void_t * optval,
                                        const cf::int32_t optlen) const
@@ -454 +454 @@
 }
 
-cf::void_t cf::network::tcp::setNonBlocking(const cf::bool_t flag)
+cf::void_t cf::net::tcp::setNonBlocking(const cf::bool_t flag)
 {
 #ifdef _ON_WINDOWS
@@ -469 +469 @@
 }
 
-cf::void_t cf::network::tcp::setTimeout(const cf::int32_t seconds)
+cf::void_t cf::net::tcp::setTimeout(const cf::int32_t seconds)
 {
     setNonBlocking(seconds > 0 /*? true : false*/);
@@ -475 +475 @@
 }
 
-cf::network::host cf::network::tcp::peer() const
+cf::net::host cf::net::tcp::peer() const
     throw (cf::exception)
 {
@@ -488 +488 @@
 }
 
-cf::network::host cf::network::tcp::local() const
+cf::net::host cf::net::tcp::local() const
     throw (cf::exception)
 {
@@ -501 +501 @@
 }
 
-std::string cf::network::nic::getMACAddress()
+std::string cf::net::nic::getMACAddress()
     throw (cf::exception)
 {
@@ -529 +529 @@
 
 
-cf::uint32_t cf::network::byteOrder::htonl(cf::uint32_t in)
+cf::uint32_t cf::net::byteOrder::htonl(cf::uint32_t in)
 {
     return ::htonl(in);
 }
 
-cf::uint16_t cf::network::byteOrder::htons(cf::uint16_t in)
+cf::uint16_t cf::net::byteOrder::htons(cf::uint16_t in)
 {
     return ::htons(in);
 }
 
-cf::uint32_t cf::network::byteOrder::ntohl(cf::uint32_t in)
+cf::uint32_t cf::net::byteOrder::ntohl(cf::uint32_t in)
 {
     return ::ntohl(in);
 }
 
-cf::uint16_t cf::network::byteOrder::ntohs(cf::uint16_t in)
+cf::uint16_t cf::net::byteOrder::ntohs(cf::uint16_t in)
 {
     return ::ntohs(in);

trunk/test/test.cpp

@@ -6 +6 @@
 #include "cf/task.h"
 #include "cf/util.h"
-#include "cf/network.h"
+#include "cf/net.h"
 
 #include <string>
@@ -158 +158 @@
 {
     std::cout << "H/W Address : "
-              << cf::network::nic::getMACAddress()
+              << cf::net::nic::getMACAddress()
               << std::endl;
 }
@@ -204 +204 @@
     try
     {
-        cf::network::tcp server;
-        cf::network::tcp client;
+        cf::net::tcp server;
+        cf::net::tcp client;
         cf::bin msg;
 
@@ -214 +214 @@
         {
             client.attach(server.accept().detach());
-            cf::network::host peer = client.peer();
+            cf::net::host peer = client.peer();
             std::cout << "client <"
                       << peer.address() << ":" << peer.port()
@@ -242 +242 @@
     try
     {
-        cf::network::tcp client;
-        cf::network::host host(HOST, PORT);
+        cf::net::tcp client;
+        cf::net::host host(HOST, PORT);
 
         cf::ulong_t tid = cf::task::thread::id();

trunk/windows/libcf++.sln

@@ -1 +1 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcf++", "libcf++.vcproj", "{F6D565DE-91B5-46E1-AD17-2C7067C1DDCE}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcf++", "libcf++.vcxproj", "{F6D565DE-91B5-46E1-AD17-2C7067C1DDCE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{A5567A0F-56C8-404E-AB02-5E95C8EE6BC0}"
-    ProjectSection(ProjectDependencies) = postProject
-        {F6D565DE-91B5-46E1-AD17-2C7067C1DDCE} = {F6D565DE-91B5-46E1-AD17-2C7067C1DDCE}
-    EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcxproj", "{A5567A0F-56C8-404E-AB02-5E95C8EE6BC0}"
 EndProject
 Global