diff --git a/daemon/face/ethernet-channel-factory.cpp b/daemon/face/ethernet-channel-factory.cpp index 4c47f853..86ad1a5a 100644 --- a/daemon/face/ethernet-channel-factory.cpp +++ b/daemon/face/ethernet-channel-factory.cpp @@ -70,6 +70,9 @@ EthernetChannelFactory::findAllInterfaces() boost::starts_with(interface, "nfqueue")) // ignore Linux netfilter devices continue; + if (boost::starts_with(interface, "fw")) + // ignore OSX firewire interface + continue; // maybe add interface addresses too // interface.addAddress ... diff --git a/tests/face/ethernet.cpp b/tests/face/ethernet.cpp index cd840083..f03cb689 100644 --- a/tests/face/ethernet.cpp +++ b/tests/face/ethernet.cpp @@ -21,16 +21,19 @@ BOOST_AUTO_TEST_CASE(MulticastFacesMap) std::vector interfaces = EthernetChannelFactory::findAllInterfaces(); if (interfaces.size() > 0) { - shared_ptr face1 = factory.createMulticast(interfaces[0], - ethernet::getBroadcastAddress()); - shared_ptr face1bis = factory.createMulticast(interfaces[0], - ethernet::getBroadcastAddress()); + shared_ptr face1; + BOOST_REQUIRE_NO_THROW(face1 = factory.createMulticast(interfaces[0], + ethernet::getBroadcastAddress())); + shared_ptr face1bis; + BOOST_REQUIRE_NO_THROW(face1bis = factory.createMulticast(interfaces[0], + ethernet::getBroadcastAddress())); BOOST_CHECK_EQUAL(face1, face1bis); if (interfaces.size() > 1) { - shared_ptr face2 = factory.createMulticast(interfaces[1], - ethernet::getBroadcastAddress()); + shared_ptr face2; + BOOST_REQUIRE_NO_THROW(face2 = factory.createMulticast(interfaces[1], + ethernet::getBroadcastAddress())); BOOST_CHECK_NE(face1, face2); } else @@ -39,8 +42,9 @@ BOOST_AUTO_TEST_CASE(MulticastFacesMap) "only one interface available for pcap"); } - shared_ptr face3 = factory.createMulticast(interfaces[0], - ethernet::getDefaultMulticastAddress()); + shared_ptr face3; + BOOST_REQUIRE_NO_THROW(face3 = factory.createMulticast(interfaces[0], + ethernet::getDefaultMulticastAddress())); BOOST_CHECK_NE(face1, face3); } else