face: Adding new 'createFace' method in all Factories
This method accepts parsed URI object and attempts to create Face on the
right channel (e.g., if hostname in URI resolved to IPv6, IPv6 TCP channel
will be used).
Factories that do not support 'createFace' operation will throw an exception.
As of this commit, *Factory::create methods are renamed to more explicit
*Factory::createChannel, and *Factory::connect to *Factory::createFace.
All other Factory-specific methods should denote what exactly is
created: channel, face, or multicast face.
Change-Id: I6396dc84c4cd8bbcdde9f55cfac90635d99e93e9
Refs: #1195
diff --git a/daemon/face/ethernet-factory.hpp b/daemon/face/ethernet-factory.hpp
index d676f47..2eeca7b 100644
--- a/daemon/face/ethernet-factory.hpp
+++ b/daemon/face/ethernet-factory.hpp
@@ -39,8 +39,8 @@
* \throws EthernetFactory::Error or EthernetFace::Error
*/
shared_ptr<EthernetFace>
- createMulticast(const ethernet::Endpoint& interface,
- const ethernet::Address& address);
+ createMulticastFace(const ethernet::Endpoint& interface,
+ const ethernet::Address& address);
/**
* \brief Get a list of devices that can be opened for a live capture
@@ -50,6 +50,13 @@
static std::vector<ethernet::Endpoint>
findAllInterfaces();
+ // from Factory
+
+ virtual void
+ createFace(const FaceUri& uri,
+ const FaceCreatedCallback& onCreated,
+ const FaceConnectFailedCallback& onConnectFailed);
+
private:
void
afterFaceFailed(const ethernet::Endpoint& endpoint,
@@ -64,8 +71,8 @@
* \throws never
*/
shared_ptr<EthernetFace>
- findMulticast(const ethernet::Endpoint& interface,
- const ethernet::Address& address) const;
+ findMulticastFace(const ethernet::Endpoint& interface,
+ const ethernet::Address& address) const;
private:
typedef std::map< std::pair<ethernet::Endpoint, ethernet::Address>,