commit ef04f278924f00a952d57b475085bfdf96edcda1
author Steve DiBenedetto <dibenede@cs.colostate.edu> Wed Jun 04 14:28:31 2014 -0600
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Fri Jun 13 11:30:36 2014 -0700
tree 85489c27128841a59e5e25db2b1a4ad8a1f32c92
parent 08d07a764e074f687399ba39ed2ee1e30cede1d8

face, mgmt: add channel status dataset publisher

Expose channel maps in protocol factories

Change-Id: I057b1bba638bfc9372867318653d71ba7d0e9888
Refs: #1631, #1653

daemon/face/websocket-factory.cpp

diff --git a/daemon/face/websocket-factory.cpp b/daemon/face/websocket-factory.cpp
index 8a6e6c3..30f3afd 100644
--- a/daemon/face/websocket-factory.cpp
+++ b/daemon/face/websocket-factory.cpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014  Regents of the University of California,
- *                     Arizona Board of Regents,
- *                     Colorado State University,
- *                     University Pierre & Marie Curie, Sorbonne University,
- *                     Washington University in St. Louis,
- *                     Beijing Institute of Technology,
- *                     The University of Memphis
+ * Copyright (c) 2014,  Regents of the University of California,
+ *                      Arizona Board of Regents,
+ *                      Colorado State University,
+ *                      University Pierre & Marie Curie, Sorbonne University,
+ *                      Washington University in St. Louis,
+ *                      Beijing Institute of Technology,
+ *                      The University of Memphis
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -21,9 +21,10 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "websocket-factory.hpp"
+#include "core/resolver.hpp"
 
 namespace nfd {
 
@@ -50,16 +51,10 @@
 }
 
 shared_ptr<WebSocketChannel>
-WebSocketFactory::createChannel(const std::string& localIPAddress,
-                                uint16_t localPort)
+WebSocketFactory::createChannel(const std::string& host, const std::string& port)
 {
-  boost::system::error_code ec;
-  ip::address address = ip::address::from_string(localIPAddress, ec);
-  if (ec)
-    {
-      throw Error("Invalid address format: " + localIPAddress);
-    }
-  websocket::Endpoint endpoint(address, localPort);
+  ip::tcp::endpoint tcpEndpoint = TcpResolver::syncResolve(host, port);
+  websocket::Endpoint endpoint(tcpEndpoint.address(), tcpEndpoint.port());
   return createChannel(endpoint);
 }
 
@@ -81,4 +76,16 @@
   throw Error("WebSocketFactory does not support 'createFace' operation");
 }
 
+std::list<shared_ptr<const Channel> >
+WebSocketFactory::getChannels() const
+{
+  std::list<shared_ptr<const Channel> > channels;
+  for (ChannelMap::const_iterator i = m_channels.begin(); i != m_channels.end(); ++i)
+    {
+      channels.push_back(i->second);
+    }
+
+  return channels;
+}
+
 } // namespace nfd