Changeset 14 in libcf++

Timestamp:

06/13/15 18:44:16 (9 years ago)

Author:

cheese

Message:

#1 interface for connection with address/port

Location:

trunk

Files:

• include/cf/network.h (modified) (2 diffs)
• src/network.cpp (modified) (4 diffs)

trunk/include/cf/network.h

@@ -101 +101 @@
 
             /**
-             * connect to address:port
+             * connect to host
              * @param peer peer host
              * @param timeout timeout
@@ -107 +107 @@
              */
             cf::void_t connect(const host & peer,
+                               const cf::int32_t timeout = 0)
+                throw (cf::exception);
+
+            /**
+             * connect to address:port
+             * @param address address
+             * @param port port
+             * @param timeout timeout
+             * @throw cf::exception
+             */
+            cf::void_t connect(const std::string & address,
+                               const cf::uint16_t port,
                                const cf::int32_t timeout = 0)
                 throw (cf::exception);

trunk/src/network.cpp

@@ -155 +155 @@
 cf::bool_t cf::network::host::empty() const
 {
-    return (address().empty() || port() <= 0) ? true : false;
+    return (address().empty() || port() == 0) ? true : false;
 }
 
@@ -209 +209 @@
     throw (cf::exception)
 {
-    if (peer.empty())
-        THROW_EXCEPTION("invalid host info");
-
+    connect(peer.address(), peer.port(), timeout);
+}
+
+cf::void_t cf::network::tcp::connect(const std::string & address,
+                                     const cf::uint16_t port,
+                                     const cf::int32_t timeout)
+    throw (cf::exception)
+{
     cf::int32_t result = 0;
     cf::int32_t retval = 0;
@@ -218 +223 @@
     struct hostent * hostEnt;
 
-    const cf::char_t * host = peer.address().c_str();
-    cf::uint16_t port = peer.port();
+    const cf::char_t * host = address.c_str();
 
     /* 1. set data */
@@ -353 +357 @@
     cf::int32_t size = static_cast<cf::int32_t>(in.size());
 
-    cf::int32_t sentSize = (cf::int32_t)::send (mSocket, buf, size, 0);
+    cf::int32_t sentSize = (cf::int32_t)::send(mSocket, buf, size, 0);
     if (sentSize != size)
         THROW_EXCEPTION("cannot send (" << cf::exception::systemCode() << ")");