Parcourir la source

[2902] Build LPF sockets on Linux only.

Marcin Siodelski il y a 12 ans
Parent
commit
fa9feb90e8

+ 4 - 0
src/lib/dhcp/Makefile.am

@@ -38,7 +38,11 @@ libb10_dhcp___la_SOURCES += pkt6.cc pkt6.h
 libb10_dhcp___la_SOURCES += pkt4.cc pkt4.h
 libb10_dhcp___la_SOURCES += pkt_filter.h
 libb10_dhcp___la_SOURCES += pkt_filter_inet.cc pkt_filter_inet.h
+
+if OS_LINUX
 libb10_dhcp___la_SOURCES += pkt_filter_lpf.cc pkt_filter_lpf.h
+endif
+
 libb10_dhcp___la_SOURCES += std_option_defs.h
 
 libb10_dhcp___la_CXXFLAGS = $(AM_CXXFLAGS)

+ 4 - 0
src/lib/dhcp/tests/Makefile.am

@@ -44,7 +44,11 @@ libdhcp___unittests_SOURCES += option_space_unittest.cc
 libdhcp___unittests_SOURCES += pkt4_unittest.cc
 libdhcp___unittests_SOURCES += pkt6_unittest.cc
 libdhcp___unittests_SOURCES += pkt_filter_inet_unittest.cc
+
+if OS_LINUX
 libdhcp___unittests_SOURCES += pkt_filter_lpf_unittest.cc
+endif
+
 libdhcp___unittests_SOURCES += protocol_util_unittest.cc
 libdhcp___unittests_SOURCES += duid_unittest.cc
 

+ 0 - 2
src/lib/dhcp/tests/iface_mgr_unittest.cc

@@ -19,7 +19,6 @@
 #include <dhcp/iface_mgr.h>
 #include <dhcp/pkt6.h>
 #include <dhcp/pkt_filter.h>
-#include <dhcp/pkt_filter_lpf.h>
 
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
@@ -105,7 +104,6 @@ class NakedIfaceMgr: public IfaceMgr {
     // "naked" Interface Manager, exposes internal fields
 public:
     NakedIfaceMgr() {
-        //        setPacketFilter(PktFilterPtr(new PktFilterLPF()));
     }
     IfaceCollection & getIfacesLst() { return ifaces_; }
 };