|
@@ -57,7 +57,7 @@ TestControl::TestControlSocket::TestControlSocket(const int socket) :
|
|
|
}
|
|
|
|
|
|
TestControl::TestControlSocket::~TestControlSocket() {
|
|
|
- IfaceMgr::Iface* iface = IfaceMgr::instance().getIface(ifindex_);
|
|
|
+ Iface* iface = IfaceMgr::instance().getIface(ifindex_);
|
|
|
if (iface) {
|
|
|
iface->delSocket(sockfd_);
|
|
|
}
|
|
@@ -70,9 +70,9 @@ TestControl::TestControlSocket::initSocketData() {
|
|
|
for (IfaceMgr::IfaceCollection::const_iterator it = ifaces.begin();
|
|
|
it != ifaces.end();
|
|
|
++it) {
|
|
|
- const IfaceMgr::SocketCollection& socket_collection =
|
|
|
+ const Iface::SocketCollection& socket_collection =
|
|
|
it->getSockets();
|
|
|
- for (IfaceMgr::SocketCollection::const_iterator s =
|
|
|
+ for (Iface::SocketCollection::const_iterator s =
|
|
|
socket_collection.begin();
|
|
|
s != socket_collection.end();
|
|
|
++s) {
|
|
@@ -653,7 +653,7 @@ TestControl::openSocket() const {
|
|
|
// If user specified interface name with '-l' the
|
|
|
// IPV6_MULTICAST_IF has to be set.
|
|
|
if ((ret >= 0) && options.isInterface()) {
|
|
|
- IfaceMgr::Iface* iface =
|
|
|
+ Iface* iface =
|
|
|
IfaceMgr::instance().getIface(options.getLocalName());
|
|
|
if (iface == NULL) {
|
|
|
isc_throw(Unexpected, "unknown interface "
|
|
@@ -1791,7 +1791,7 @@ TestControl::setDefaults4(const TestControlSocket& socket,
|
|
|
const Pkt4Ptr& pkt) {
|
|
|
CommandOptions& options = CommandOptions::instance();
|
|
|
// Interface name.
|
|
|
- IfaceMgr::Iface* iface = IfaceMgr::instance().getIface(socket.ifindex_);
|
|
|
+ Iface* iface = IfaceMgr::instance().getIface(socket.ifindex_);
|
|
|
if (iface == NULL) {
|
|
|
isc_throw(BadValue, "unable to find interface with given index");
|
|
|
}
|
|
@@ -1817,7 +1817,7 @@ TestControl::setDefaults6(const TestControlSocket& socket,
|
|
|
const Pkt6Ptr& pkt) {
|
|
|
CommandOptions& options = CommandOptions::instance();
|
|
|
// Interface name.
|
|
|
- IfaceMgr::Iface* iface = IfaceMgr::instance().getIface(socket.ifindex_);
|
|
|
+ Iface* iface = IfaceMgr::instance().getIface(socket.ifindex_);
|
|
|
if (iface == NULL) {
|
|
|
isc_throw(BadValue, "unable to find interface with given index");
|
|
|
}
|